Revert "[test] disable packaging tests for suse boxes" (#38864)

andyb-elastic · web-flow · commit 94a4c3227bff · 2019-02-14T10:29:00.000-08:00
This reverts commit 0b601c6.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -547,11 +547,7 @@ class VagrantTestPlugin implements Plugin<Project> {
                     project.gradle.removeListener(batsPackagingReproListener)
                 }
                 if (project.extensions.esvagrant.boxes.contains(box)) {
-                    // these tests are temporarily disabled for suse boxes while we debug an issue
-                    // https://github.com/elastic/elasticsearch/issues/30295
-                    if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {
-                        packagingTest.dependsOn(batsPackagingTest)
-                    }
+                    packagingTest.dependsOn(batsPackagingTest)
                 }
             }
 
@@ -590,11 +586,7 @@ class VagrantTestPlugin implements Plugin<Project> {
                 project.gradle.removeListener(javaPackagingReproListener)
             }
             if (project.extensions.esvagrant.boxes.contains(box)) {
-                // these tests are temporarily disabled for suse boxes while we debug an issue
-                // https://github.com/elastic/elasticsearch/issues/30295
-                if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {
-                    packagingTest.dependsOn(javaPackagingTest)
-                }
+                packagingTest.dependsOn(javaPackagingTest)
             }
 
             /*

Original file line number	Diff line number	Diff line change
`@@ -547,11 +547,7 @@ class VagrantTestPlugin implements Plugin<Project> {`
`547`	`547`	`project.gradle.removeListener(batsPackagingReproListener)`
`548`	`548`	`}`
`549`	`549`	`if (project.extensions.esvagrant.boxes.contains(box)) {`
`550`		`- // these tests are temporarily disabled for suse boxes while we debug an issue`
`551`		`- // https://github.com/elastic/elasticsearch/issues/30295`
`552`		`- if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {`
`553`		`- packagingTest.dependsOn(batsPackagingTest)`
`554`		`- }`
	`550`	`+ packagingTest.dependsOn(batsPackagingTest)`
`555`	`551`	`}`
`556`	`552`	`}`
`557`	`553`
`@@ -590,11 +586,7 @@ class VagrantTestPlugin implements Plugin<Project> {`
`590`	`586`	`project.gradle.removeListener(javaPackagingReproListener)`
`591`	`587`	`}`
`592`	`588`	`if (project.extensions.esvagrant.boxes.contains(box)) {`
`593`		`- // these tests are temporarily disabled for suse boxes while we debug an issue`
`594`		`- // https://github.com/elastic/elasticsearch/issues/30295`
`595`		`- if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {`
`596`		`- packagingTest.dependsOn(javaPackagingTest)`
`597`		`- }`
	`589`	`+ packagingTest.dependsOn(javaPackagingTest)`
`598`	`590`	`}`
`599`	`591`
`600`	`592`	`/*`