From b9584672a460e6b2fcff47ecdd72e856bafa7dc2 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Mon, 7 Oct 2019 09:33:26 +0300 Subject: [PATCH] Mute docker packaging tests (DockerTests) Tracked in #47639 --- .../groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java | 3 ++- .../java/org/elasticsearch/packaging/test/DockerTests.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java index 6203d0c9b12e5..2f254b30466a3 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java @@ -319,7 +319,8 @@ private List configureDistributions(Project project, List currentDistros = new ArrayList<>(); List upgradeDistros = new ArrayList<>(); - for (Type type : Arrays.asList(Type.DEB, Type.RPM, Type.DOCKER)) { + // Docker disabled for https://github.com/elastic/elasticsearch/issues/47639 + for (Type type : Arrays.asList(Type.DEB, Type.RPM /*,Type.DOCKER*/)) { for (Flavor flavor : Flavor.values()) { for (boolean bundledJdk : Arrays.asList(true, false)) { // We should never add a Docker distro with bundledJdk == false diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java index 52205263d3ed3..daad67f7fb111 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java @@ -28,6 +28,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import java.nio.file.Files; import java.nio.file.Path; @@ -54,6 +55,7 @@ import static org.hamcrest.Matchers.emptyString; import static org.junit.Assume.assumeTrue; +@Ignore("https://github.com/elastic/elasticsearch/issues/47639") public class DockerTests extends PackagingTestCase { protected DockerShell sh;