chore: fix path setting issue with Windows tests (#828)

* chore: fix path setting issue with Windows tests * add back refreshEnv calls
GoogleCloudPlatform · May 2, 2022 · 8fbc8ad · 8fbc8ad
1 parent 6839b7d
commit 8fbc8ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -26,6 +26,6 @@ if [ -n "$KOKORO_GFILE_DIR" ]; then
 fi
 
 echo -e "******************** Running tests... ********************\n"
-echo "JAVA_HOME: $JAVA_HOME"
+echo "Maven version: $(mvn --version)"
 mvn -e -B clean verify -P e2e -Dcheckstyle.skip
 echo -e "******************** Tests complete.  ********************\n"
diff --git a/.kokoro/tests/run_tests_java11.bat b/.kokoro/tests/run_tests_java11.bat
@@ -1,2 +1,4 @@
-set JAVA_HOME="C:\OpenJDK\jdk-11.0.11"
+setx JAVA_HOME "C:\\OpenJDK\jdk-11.0.11"
+setx PATH "%JAVA_HOME%\bin;%PATH%"
+call RefreshEnv.cmd
 "C:\Program Files\Git\bin\bash.exe" github/cloud-sql-jdbc-socket-factory/.kokoro/tests/run_tests.sh
diff --git a/.kokoro/tests/run_tests_java17.bat b/.kokoro/tests/run_tests_java17.bat
@@ -1,2 +1,4 @@
-set JAVA_HOME="C:\OpenJDK\jdk-17"
+setx JAVA_HOME "C:\\OpenJDK\jdk-17"
+setx PATH "%JAVA_HOME%\bin;%PATH%"
+call RefreshEnv.cmd
 "C:\Program Files\Git\bin\bash.exe" github/cloud-sql-jdbc-socket-factory/.kokoro/tests/run_tests.sh