Skip to content

Commit 9c5376f

Browse files
authored
[9.0] Remove Fips tests wiring from 9.0 branch (#127589)
The 9.0 branch does not provide a reasonable fips image. this was a backport merge issue causing packaging tests to fail.
1 parent 9343efc commit 9c5376f

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ public class InternalElasticsearchDistributionTypes {
2121
public static final ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
2222
public static final ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2323
public static final ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
24-
public static final ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType();
2524

2625
public static final List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
2726
DEB,
2827
RPM,
2928
DOCKER,
3029
DOCKER_IRONBANK,
3130
DOCKER_WOLFI,
32-
DOCKER_CLOUD_ESS,
33-
DOCKER_FIPS
31+
DOCKER_CLOUD_ESS
3432
);
3533
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DEB;
5252
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
5353
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
54-
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_FIPS;
5554
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
5655
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
5756
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.RPM;
@@ -152,7 +151,6 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
152151
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
153152
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
154153
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
155-
lifecyleTasks.put(DOCKER_FIPS, project.getTasks().register(taskPrefix + ".docker-fips"));
156154
lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
157155
lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages"));
158156
lifecyleTasks.put(RPM, lifecyleTasks.get(DEB));

0 commit comments

Comments
 (0)