github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mute docker packaging tests (DockerTests)

Browse source 
Tracked in #47639
This commit is contained in:
Alpar Torok 2019-10-07 09:33:26 +03:00
parent 2ea8844b17
commit b9584672a4
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java
View file

@ -319,7 +319,8 @@ public class DistroTestPlugin implements Plugin<Project> {
List<ElasticsearchDistribution> currentDistros = new ArrayList<>(); List<ElasticsearchDistribution> currentDistros = new ArrayList<>();
List<ElasticsearchDistribution> upgradeDistros = new ArrayList<>(); List<ElasticsearchDistribution> 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 (Flavor flavor : Flavor.values()) {
for (boolean bundledJdk : Arrays.asList(true, false)) { for (boolean bundledJdk : Arrays.asList(true, false)) {
// We should never add a Docker distro with bundledJdk == false // We should never add a Docker distro with bundledJdk == false

2
qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
View file

@ -28,6 +28,7 @@ import org.elasticsearch.packaging.util.Shell.Result;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -54,6 +55,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.emptyString;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
@Ignore("https://github.com/elastic/elasticsearch/issues/47639")
public class DockerTests extends PackagingTestCase { public class DockerTests extends PackagingTestCase {
protected DockerShell sh; protected DockerShell sh;