Disable reindex from old tests on JDK 10

jasontedor · jasontedor · commit 0d42178679ae · 2017-12-23T08:40:21.000-05:00
We disable these tests because the JVM flags we use will not start with
JDK 10. Since we do not support running these old versions on newer JDKs
anyway, this commit disables testing of these when running on JDK 10.
diff --git a/qa/reindex-from-old/build.gradle b/qa/reindex-from-old/build.gradle
@@ -51,7 +51,7 @@ dependencies {
   es090 'org.elasticsearch:elasticsearch:0.90.13@zip'
 }
 
-if (project.javaVersion == JavaVersion.VERSION_1_9 || Os.isFamily(Os.FAMILY_WINDOWS)) {
+if (project.javaVersion >= JavaVersion.VERSION_1_9 || Os.isFamily(Os.FAMILY_WINDOWS)) {
   /* We can't run the dependencies with Java 9 so for now we'll skip the whole
    * thing. We can't get the pid files in windows so we skip that as well.... */
   integTest.enabled = false

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ dependencies {`
`51`	`51`	`es090 'org.elasticsearch:elasticsearch:0.90.13@zip'`
`52`	`52`	`}`
`53`	`53`
`54`		`-if (project.javaVersion == JavaVersion.VERSION_1_9 \|\| Os.isFamily(Os.FAMILY_WINDOWS)) {`
	`54`	`+if (project.javaVersion >= JavaVersion.VERSION_1_9 \|\| Os.isFamily(Os.FAMILY_WINDOWS)) {`
`55`	`55`	`/* We can't run the dependencies with Java 9 so for now we'll skip the whole`
`56`	`56`	`* thing. We can't get the pid files in windows so we skip that as well.... */`
`57`	`57`	`integTest.enabled = false`