---

chingor13 · sduskis · commit f76ae6b28c75 · 2019-02-07T08:55:29.000-05:00
yaml --- r: 14089 b: refs/heads/autosynth-monitoring c: f27d35d h: refs/heads/master i: 14087: 8213f65
diff --git a/[refs] b/[refs]
@@ -115,7 +115,7 @@ refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 8e86445e504cea6f99b9fb237bfd7f0e5ef8b3ce
 refs/heads/autosynth-container: f6384095f50b31bfc8208542a49181e158d3681c
 refs/heads/autosynth-dataproc: bc74a8841bc1693d7945d991d15979df550b1fd1
-refs/heads/autosynth-monitoring: d889bb0d5635749c0bc818c3caf72a953d32410f
+refs/heads/autosynth-monitoring: f27d35d5f51ccaf06f12084dbc75f332626ffe56
 refs/heads/autosynth-pubsub: ed3340e32d13bb1a42ca4431cb1ad9bdaf550aa4
 refs/heads/autosynth-video-intelligence: 3e8faeeee2f803271529bd6e89b621c1ca098628
 refs/heads/autosynth-vision: d758c43ba2ef4f4f7ad07b722617cb39fe3f29db
diff --git a/branches/autosynth-monitoring/.kokoro/build.sh b/branches/autosynth-monitoring/.kokoro/build.sh
@@ -17,14 +17,44 @@ set -eo pipefail
 
 cd github/google-cloud-java/
 
+function client_has_changes() {
+  CLIENT_NAME=$1
+  if [[ ! -z $(git diff master google-cloud-clients/google-cloud-core*) ]]; then
+    echo "true"
+    return
+  fi
+
+  if [[ ! -z $(git diff master google-cloud-clients/${CLIENT_NAME}) ]]; then
+    echo "true"
+    return
+  fi
+
+  if [[ ! -z $(git diff master google-api-grpc/*${CLIENT_NAME}*) ]]; then
+    echo "true"
+    return
+  fi
+
+  echo "false"
+}
+
 # Print out Java version
 java -version
 echo $JOB_TYPE
 
+if [[ "${SKIP_INTEGRATION_TESTS_IF_NO_CHANGES}" == "true" ]] &&
+   [[ "${JOB_TYPE}" == "integration" ]]; then
+  CLIENT=$(echo ${INTEGRATION_TEST_ARGS} | cut -d' ' -f1 | cut -d'/' -f2)
+  CLIENT_HAS_CHANGES=$(client_has_changes ${CLIENT})
+  if [[ "${CLIENT_HAS_CHANGES}" == "false" ]]; then
+    echo "No difference from master, skipping tests."
+    exit 0
+  fi
+fi
+
 mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
 
 # prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path
-if [ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
+if [[ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
     export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
diff --git a/branches/autosynth-monitoring/.kokoro/common.cfg b/branches/autosynth-monitoring/.kokoro/common.cfg
@@ -11,3 +11,9 @@ env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/google-auth-library-java/.kokoro/build.sh"
 }
+
+# By default, always run integration tests
+env_vars: {
+  key: "SKIP_INTEGRATION_TESTS_IF_NO_CHANGES"
+  value: "false"
+}
diff --git a/branches/autosynth-monitoring/.kokoro/presubmit/common.cfg b/branches/autosynth-monitoring/.kokoro/presubmit/common.cfg
@@ -14,13 +14,19 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 build_file: "google-cloud-java/.kokoro/trampoline.sh"
 
 env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/google-cloud-java/.kokoro/build.sh"
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-cloud-java/.kokoro/build.sh"
 }
 
 env_vars: {
-    key: "JOB_TYPE"
-    value: "test"
+  key: "JOB_TYPE"
+  value: "test"
+}
+
+# For presubmits, only run integrations if the code has changed
+env_vars: {
+  key: "SKIP_INTEGRATION_TESTS_IF_NO_CHANGES"
+  value: "true"
 }
 
 before_action {
