Skip to content

Resolve bwc dependencies for packer cache #125625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2025
Merged

Resolve bwc dependencies for packer cache #125625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,16 @@ allprojects {
tasks.register('resolveAllDependencies', ResolveAllDependencies) {
def ignoredPrefixes = [DistributionDownloadPlugin.ES_DISTRO_CONFIG_PREFIX, "jdbcDriver"]
configs = project.configurations.matching { config -> ignoredPrefixes.any { config.name.startsWith(it) } == false }
resolveJavaToolChain = true
if(project.path == ':') {
resolveJavaToolChain = true

// ensure we have best possible caching of bwc builds
dependsOn ":distribution:bwc:bugfix:buildBwcLinuxTar"
dependsOn ":distribution:bwc:bugfix2:buildBwcLinuxTar"
dependsOn ":distribution:bwc:minor:buildBwcLinuxTar"
dependsOn ":distribution:bwc:staged:buildBwcLinuxTar"
dependsOn ":distribution:bwc:staged2:buildBwcLinuxTar"
}
if (project.path.contains("fixture")) {
dependsOn tasks.withType(ComposePull)
}
Expand All @@ -306,6 +315,7 @@ allprojects {
// ensure we resolve p2 dependencies for the spotless eclipse formatter
dependsOn "spotlessJavaCheck"
}

}

ext.withReleaseBuild = { Closure config ->
Expand Down
8 changes: 8 additions & 0 deletions ...minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ public final class MinioTestContainer extends DockerEnvironmentAwareTestContaine
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
private final boolean enabled;

/**
* for packer caching only
* see CacheCacheableTestFixtures.
* */
protected MinioTestContainer() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes another packer cache issue when caching docker images we rely on in our fixtures: https://buildkite.com/elastic/elasticsearch-vm-images/builds/671#0195c53c-d566-405c-9503-afc95a6e6706

this(true, "minio", "minio123", "test-bucket");
}

public MinioTestContainer(boolean enabled, String accessKey, String secretKey, String bucketName) {
super(
new ImageFromDockerfile("es-minio-testfixture").withDockerfileFromBuilder(
Expand Down