Skip to content

Commit bb4a444

Browse files
authored
[Gradle] Fix packaging tests after removing cloud docker image (#115654)
1 parent 0b94bb8 commit bb4a444

File tree

4 files changed

+0
-34
lines changed

4 files changed

+0
-34
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
172172
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_IRONBANK) {
173173
return projectName + "ironbank-docker" + archString + "-export";
174174
}
175-
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_CLOUD) {
176-
return projectName + "cloud-docker" + archString + "-export";
177-
}
178175
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS) {
179176
return projectName + "cloud-ess-docker" + archString + "-export";
180177
}

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class InternalElasticsearchDistributionTypes {
1919
public static ElasticsearchDistributionType DOCKER = new DockerElasticsearchDistributionType();
2020
public static ElasticsearchDistributionType DOCKER_UBI = new DockerUbiElasticsearchDistributionType();
2121
public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
22-
public static ElasticsearchDistributionType DOCKER_CLOUD = new DockerCloudElasticsearchDistributionType();
2322
public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2423
public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
2524

@@ -29,7 +28,6 @@ public class InternalElasticsearchDistributionTypes {
2928
DOCKER,
3029
DOCKER_UBI,
3130
DOCKER_IRONBANK,
32-
DOCKER_CLOUD,
3331
DOCKER_CLOUD_ESS,
3432
DOCKER_WOLFI
3533
);

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
@@ -49,7 +49,6 @@
4949
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.ALL_INTERNAL;
5050
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DEB;
5151
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
52-
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD;
5352
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
5453
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
5554
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_UBI;
@@ -149,7 +148,6 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
149148
lifecyleTasks.put(DOCKER, project.getTasks().register(taskPrefix + ".docker"));
150149
lifecyleTasks.put(DOCKER_UBI, project.getTasks().register(taskPrefix + ".docker-ubi"));
151150
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
152-
lifecyleTasks.put(DOCKER_CLOUD, project.getTasks().register(taskPrefix + ".docker-cloud"));
153151
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
154152
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
155153
lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));

0 commit comments

Comments
 (0)