Update java8 tests to run against java11 (GoogleCloudPlatform#2029)

averikitsch · web-flow · commit 2ee9cb030ac8 · 2020-01-24T14:44:38.000-08:00
* Update java8 tests to run against java11

* fix pom

* add allowed java versions

* remove sample
diff --git a/.kokoro/java8/common.cfg b/.kokoro/java8/common.cfg
@@ -32,7 +32,7 @@ action {
 # Set the JAVA VERSION env var.
 env_vars: {
     key: "JAVA_VERSION"
-    value: "1.8"
+    value: "1.8, 11"
 }
 
 # Configure the docker image for kokoro-trampoline.
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -110,7 +110,8 @@ for file in **/pom.xml; do
 
     # Fail the tests if no Java version was found.
     POM_JAVA=$(grep -oP '(?<=<maven.compiler.target>).*?(?=</maven.compiler.target>)' pom.xml)
-    if [[ "$POM_JAVA" = "" ]]; then
+    ALLOWED_VERSIONS=("1.8" "11")
+    if [[ "$POM_JAVA" = "" ]] || [[ !  "${ALLOWED_VERSIONS[@]}" =~ "${POM_JAVA}" ]]; then
         RTN=1
         echo -e "\n Testing failed: Unable to determine Java version. Please set in pom:"
         echo -e "\n<properties>"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ action {`
`32`	`32`	`# Set the JAVA VERSION env var.`
`33`	`33`	`env_vars: {`
`34`	`34`	`key: "JAVA_VERSION"`
`35`		`- value: "1.8"`
	`35`	`+ value: "1.8, 11"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Configure the docker image for kokoro-trampoline.`