fix directory changes

Author: chingor13

.kokoro/build.sh

@@ -33,18 +33,17 @@ if [ -f "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secr
   source "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secrets"
 fi
 
-if [[ -n "${BUILD_SUBDIR}" ]]
-then
-  echo "Compiling and building all modules for ${BUILD_SUBDIR}"
-  install_modules "${BUILD_SUBDIR}"
-  echo "Running in subdir: ${BUILD_SUBDIR}"
-  pushd "${BUILD_SUBDIR}"
-fi
-
 RETURN_CODE=0
 
 case ${JOB_TYPE} in
   test)
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+    fi
     echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
     retry_with_backoff 3 10 \
       mvn test \
@@ -59,6 +58,12 @@ case ${JOB_TYPE} in
         -Dmaven.wagon.http.retryHandler.count=5 \
         -T 1C ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
+
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "restoring directory"
+      popd
+    fi
     echo "Finished running unit tests"
     ;;
   integration)
@@ -83,6 +88,10 @@ case ${JOB_TYPE} in
       echo "${BUILD_SUBDIR} not modified, skipping split integration test"
     else
       echo "${BUILD_SUBDIR} modified, running split integration test"
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
       echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
       echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
       mvn verify -Penable-integration-tests \
@@ -102,6 +111,7 @@ case ${JOB_TYPE} in
         -T 1C ${SUREFIRE_JVM_OPT}
 
       RETURN_CODE=$?
+      popd
       printf "Finished integration tests for modules:\n%s\n" "${BUILD_SUBDIR}"
     fi
     ;;
@@ -130,11 +140,15 @@ case ${JOB_TYPE} in
     fi
     ;;
   graalvm-single)
-    generate_modified_modules_list false
+    generate_modified_modules_list false    
     if [[ ! " ${modified_module_list[*]} " =~ " ${BUILD_SUBDIR} " ]]; then
       echo "${BUILD_SUBDIR} not modified, skipping split GraalVM test"
     else
       echo "${BUILD_SUBDIR} modified, running split GraalVM test"
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
       echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
       mvn test -Pnative \
         ${INTEGRATION_TEST_ARGS} \
@@ -149,6 +163,7 @@ case ${JOB_TYPE} in
         -Danimal.sniffer.skip=true
 
       RETURN_CODE=$?
+      popd
       printf "Finished GraalVM ITs for modules:\n%s\n" "${BUILD_SUBDIR}"
     fi
     ;;
@@ -185,12 +200,6 @@ case ${JOB_TYPE} in
 
 esac
 
-if [[ -n "${BUILD_SUBDIR}" ]]
-then
-  echo "restoring directory"
-  popd
-fi
-
 if [ "${REPORT_COVERAGE}" == "true" ]; then
   bash ${KOKORO_GFILE_DIR}/codecov.sh
 fi