From fadbcc0c6157f96a82731c536d9ee0fdf6ba06a4 Mon Sep 17 00:00:00 2001
From: "Yuan (Bob) Gong" <gongyuan94@gmail.com>
Date: Wed, 1 Jul 2020 19:32:18 +0800
Subject: [PATCH] test: postsubmit - fix cloudbuild job filtering. Part of
 #4046 (#4122)

---
 .cloudbuild.yaml                                  | 2 ++
 .release.cloudbuild.yaml                          | 2 ++
 test/postsubmit-tests-with-pipeline-deployment.sh | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml
index 7957f8349d1..7d9ebf3c05e 100644
--- a/.cloudbuild.yaml
+++ b/.cloudbuild.yaml
@@ -294,3 +294,5 @@ timeout: '3600s'
 options:
  diskSizeGb: 300
  machineType: 'N1_HIGHCPU_8'
+tags:
+- build-each-commit
diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
index da5bdf155c7..43a91aa4323 100644
--- a/.release.cloudbuild.yaml
+++ b/.release.cloudbuild.yaml
@@ -649,3 +649,5 @@ images:
 - 'gcr.io/ml-pipeline/google/pipelines-test/deployer:$TAG_NAME'
 - 'gcr.io/ml-pipeline/google/pipelines-test:$TAG_NAME'
 timeout: '1200s'
+tags:
+- release-on-tag
diff --git a/test/postsubmit-tests-with-pipeline-deployment.sh b/test/postsubmit-tests-with-pipeline-deployment.sh
index a3c4ed474c4..311cf9c8c8d 100755
--- a/test/postsubmit-tests-with-pipeline-deployment.sh
+++ b/test/postsubmit-tests-with-pipeline-deployment.sh
@@ -86,10 +86,11 @@ source "${DIR}/test-prep.sh"
 CLOUDBUILD_TIMEOUT_SECONDS=3600
 PULL_CLOUDBUILD_STATUS_MAX_ATTEMPT=$(expr ${CLOUDBUILD_TIMEOUT_SECONDS} / 20 )
 CLOUDBUILD_STARTED=TIMEOUT
+CLOUDBUILD_FILTER="substitutions.COMMIT_SHA:${PULL_BASE_SHA} AND tags:build-each-commit"
 
 for i in $(seq 1 ${PULL_CLOUDBUILD_STATUS_MAX_ATTEMPT})
 do
-  output=`gcloud builds list --project="$CLOUDBUILD_PROJECT" --filter="sourceProvenance.resolvedRepoSource.commitSha:${PULL_BASE_SHA}"`
+  output=`gcloud builds list --project="$CLOUDBUILD_PROJECT" --filter="$CLOUDBUILD_FILTER"`
   if [[ ${output} != "" ]]; then
     CLOUDBUILD_STARTED=True
     break
@@ -106,7 +107,7 @@ fi
 CLOUDBUILD_FINISHED=TIMEOUT
 for i in $(seq 1 ${PULL_CLOUDBUILD_STATUS_MAX_ATTEMPT})
 do
-  output=`gcloud builds list --project="$CLOUDBUILD_PROJECT" --filter="sourceProvenance.resolvedRepoSource.commitSha:${PULL_BASE_SHA}"`
+  output=`gcloud builds list --project="$CLOUDBUILD_PROJECT" --filter="$CLOUDBUILD_FILTER"`
   if [[ ${output} == *"SUCCESS"* ]]; then
     CLOUDBUILD_FINISHED=SUCCESS
     break