From bf9f57f63cc050c5c37d7774a3d899edda341ccc Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 30 Apr 2025 23:34:55 +0200 Subject: [PATCH 1/3] Remove Fips tests wiring from 9.0 branch The 9.0 branch does not provide a reasonable fips image. this was a backport merge issue causing packaging tests to fail. --- .../org/elasticsearch/gradle/internal/test/DistroTestPlugin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java index bf1745112869a..4e7658d116ac9 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java @@ -152,7 +152,6 @@ private static Map> lifecycleTask lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank")); lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess")); lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi")); - lifecyleTasks.put(DOCKER_FIPS, project.getTasks().register(taskPrefix + ".docker-fips")); lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives")); lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages")); lifecyleTasks.put(RPM, lifecyleTasks.get(DEB)); From b3ccefe1733ce21eebedc43b60058e9ae35beee1 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 5 May 2025 11:29:38 +0200 Subject: [PATCH 2/3] Remove fips from InternalElasticsearchDistributionTypes --- .../distribution/InternalElasticsearchDistributionTypes.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java index bb1851b0ea129..d973f6e4f27f9 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java @@ -21,7 +21,6 @@ public class InternalElasticsearchDistributionTypes { public static final ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType(); public static final ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType(); public static final ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType(); - public static final ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType(); public static final List ALL_INTERNAL = List.of( DEB, @@ -29,7 +28,6 @@ public class InternalElasticsearchDistributionTypes { DOCKER, DOCKER_IRONBANK, DOCKER_WOLFI, - DOCKER_CLOUD_ESS, - DOCKER_FIPS + DOCKER_CLOUD_ESS ); } From fece0bd6f6bb924ec335195bf45915022893a910 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 5 May 2025 12:05:27 +0200 Subject: [PATCH 3/3] fix imports --- .../org/elasticsearch/gradle/internal/test/DistroTestPlugin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java index 4e7658d116ac9..08e3c92307d72 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java @@ -51,7 +51,6 @@ import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DEB; import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER; import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS; -import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_FIPS; import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK; import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI; import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.RPM;