conditionally run the split integration/graalvm tests if that module was touched

Author: chingor13

.kokoro/build.sh

@@ -78,26 +78,32 @@ case ${JOB_TYPE} in
     fi
     ;;
   integration-single)
-    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
-    echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
-    mvn verify -Penable-integration-tests \
-      ${INTEGRATION_TEST_ARGS} \
-      -B -ntp -fae \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -Dorg.slf4j.simpleLogger.showDateTime=true \
-      -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-      -Dcheckstyle.skip=true \
-      -Dflatten.skip=true \
-      -Danimal.sniffer.skip=true \
-      -Djacoco.skip=true \
-      -DskipUnitTests=true \
-      -Dmaven.wagon.http.retryHandler.count=5 \
-      -T 1C ${SUREFIRE_JVM_OPT}
+    generate_modified_modules_list false
+    if [[ ! " ${modified_module_list[*]} " =~ " ${BUILD_SUBDIR} " ]]; then
+      echo "${BUILD_SUBDIR} not modified, skipping split integration test"
+    else
+      echo "${BUILD_SUBDIR} modified, running split integration test"
+      echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
+      echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
+      mvn verify -Penable-integration-tests \
+        ${INTEGRATION_TEST_ARGS} \
+        -B -ntp -fae \
+        -DtrimStackTrace=false \
+        -Dclirr.skip=true \
+        -Denforcer.skip=true \
+        -Dorg.slf4j.simpleLogger.showDateTime=true \
+        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+        -Dcheckstyle.skip=true \
+        -Dflatten.skip=true \
+        -Danimal.sniffer.skip=true \
+        -Djacoco.skip=true \
+        -DskipUnitTests=true \
+        -Dmaven.wagon.http.retryHandler.count=5 \
+        -T 1C ${SUREFIRE_JVM_OPT}
 
-    RETURN_CODE=$?
-    printf "Finished integration tests for modules:\n%s\n" "${BUILD_SUBDIR}"
+      RETURN_CODE=$?
+      printf "Finished integration tests for modules:\n%s\n" "${BUILD_SUBDIR}"
+    fi
     ;;
   graalvm-presubmit)
     generate_graalvm_presubmit_modules_list
@@ -124,21 +130,27 @@ case ${JOB_TYPE} in
     fi
     ;;
   graalvm-single)
-    echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
-    mvn test -Pnative \
-      ${INTEGRATION_TEST_ARGS} \
-      -B -ntp -fae \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -Dorg.slf4j.simpleLogger.showDateTime=true \
-      -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-      -Dcheckstyle.skip=true \
-      -Dflatten.skip=true \
-      -Danimal.sniffer.skip=true
+    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 "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
+      mvn test -Pnative \
+        ${INTEGRATION_TEST_ARGS} \
+        -B -ntp -fae \
+        -DtrimStackTrace=false \
+        -Dclirr.skip=true \
+        -Denforcer.skip=true \
+        -Dorg.slf4j.simpleLogger.showDateTime=true \
+        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+        -Dcheckstyle.skip=true \
+        -Dflatten.skip=true \
+        -Danimal.sniffer.skip=true
 
-    RETURN_CODE=$?
-    printf "Finished GraalVM ITs for modules:\n%s\n" "${BUILD_SUBDIR}"
+      RETURN_CODE=$?
+      printf "Finished GraalVM ITs for modules:\n%s\n" "${BUILD_SUBDIR}"
+    fi
     ;;
   lint)
     if [ -n "${BASE_SHA}" ] && [ -n "${HEAD_SHA}" ]; then

.kokoro/common.sh

@@ -157,6 +157,13 @@ function release_please_snapshot_pull_request() {
   fi
 }
 
+# Sets bash variables for maven_modules and modified_module_list
+# maven_modules is the list of all maven submodules of the root pom
+# modified_module_list is the subset of maven_modules that have been touched
+# in the current pull request
+#
+# The first positional argument is a value true/false. If true (default), then
+# exclude modules from the global exclusion list.
 function generate_modified_modules_list() {
   # Find the files changed from when the PR branched to the last commit
   # Filter for java modules and get all the unique elements
@@ -169,11 +176,19 @@ function generate_modified_modules_list() {
   # Generate the list of valid maven modules
   maven_modules_list=$(mvn help:evaluate -Dexpression=project.modules | grep '<.*>.*</.*>' | sed -e 's/<.*>\(.*\)<\/.*>/\1/g')
   maven_modules=()
-  for module in $maven_modules_list; do
-    if [[ ! " ${excluded_modules[*]} " =~ " ${module} " ]]; then
-      maven_modules+=("${module}")
-    fi
-  done
+
+  # If the first argument is "true" (default), then use the module exclusion list
+  use_exclusion_list=${1:-true}
+  if [[ "${use_exclusion_list}" == "true" ]]; then
+    echo "Excluding modules from the global exclusion list"
+    for module in $maven_modules_list; do
+      if [[ ! " ${excluded_modules[*]} " =~ " ${module} " ]]; then
+        maven_modules+=("${module}")
+      fi
+    done
+  else
+    maven_modules=(${maven_modules_list[*]})
+  fi
 
   modified_module_list=()
   # If either parent pom.xml is touched, run ITs on all the modules