Skip to content

Commit 7e073ab

Browse files
authored
Ignore Fips docker images in packages tests for now (elastic#125942) (elastic#125969)
* Ignore Fips docker images in packages tests for now Handled in a later work package * Fix typo (cherry picked from commit f79ff97) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java
1 parent f6c9882 commit 7e073ab

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ 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 List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
2726
DEB,
@@ -30,7 +29,6 @@ public class InternalElasticsearchDistributionTypes {
3029
DOCKER_UBI,
3130
DOCKER_IRONBANK,
3231
DOCKER_CLOUD_ESS,
33-
DOCKER_WOLFI,
34-
DOCKER_FIPS
32+
DOCKER_WOLFI
3533
);
3634
}

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

Lines changed: 0 additions & 2 deletions
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_UBI;
5756
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
@@ -154,7 +153,6 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
154153
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
155154
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
156155
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
157-
lifecyleTasks.put(DOCKER_FIPS, project.getTasks().register(taskPrefix + ".docker-fips"));
158156
lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
159157
lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages"));
160158
lifecyleTasks.put(RPM, lifecyleTasks.get(DEB));

0 commit comments

Comments
 (0)