[test] disable packaging tests for suse boxes

andyb-elastic · andyb-elastic · commit 0b601c663178 · 2018-08-13T08:56:50.000-07:00
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -526,7 +526,11 @@ class VagrantTestPlugin implements Plugin<Project> {
                     project.gradle.removeListener(batsPackagingReproListener)
                 }
                 if (project.extensions.esvagrant.boxes.contains(box)) {
-                    packagingTest.dependsOn(batsPackagingTest)
+                    // 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)
+                    }
                 }
             }
 
@@ -565,7 +569,11 @@ class VagrantTestPlugin implements Plugin<Project> {
                 project.gradle.removeListener(javaPackagingReproListener)
             }
             if (project.extensions.esvagrant.boxes.contains(box)) {
-                packagingTest.dependsOn(javaPackagingTest)
+                // 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)
+                }
             }
 
             /*

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,11 @@ class VagrantTestPlugin implements Plugin<Project> {`
`526`	`526`	`project.gradle.removeListener(batsPackagingReproListener)`
`527`	`527`	`}`
`528`	`528`	`if (project.extensions.esvagrant.boxes.contains(box)) {`
`529`		`- packagingTest.dependsOn(batsPackagingTest)`
	`529`	`+ // these tests are temporarily disabled for suse boxes while we debug an issue`
	`530`	`+ // https://github.com/elastic/elasticsearch/issues/30295`
	`531`	`+ if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {`
	`532`	`+ packagingTest.dependsOn(batsPackagingTest)`
	`533`	`+ }`
`530`	`534`	`}`
`531`	`535`	`}`
`532`	`536`
`@@ -565,7 +569,11 @@ class VagrantTestPlugin implements Plugin<Project> {`
`565`	`569`	`project.gradle.removeListener(javaPackagingReproListener)`
`566`	`570`	`}`
`567`	`571`	`if (project.extensions.esvagrant.boxes.contains(box)) {`
`568`		`- packagingTest.dependsOn(javaPackagingTest)`
	`572`	`+ // these tests are temporarily disabled for suse boxes while we debug an issue`
	`573`	`+ // https://github.com/elastic/elasticsearch/issues/30295`
	`574`	`+ if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {`
	`575`	`+ packagingTest.dependsOn(javaPackagingTest)`
	`576`	`+ }`
`569`	`577`	`}`
`570`	`578`
`571`	`579`	`/*`