test: update Kokoro to use main branch (GoogleCloudPlatform#7167)

dandhlee · web-flow · commit 089ae80f0f73 · 2021-12-01T17:18:57.000-05:00
diff --git a/.kokoro/lint/presubmit.cfg b/.kokoro/lint/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python2.7/presubmit.cfg b/.kokoro/python2.7/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python3.10/presubmit.cfg b/.kokoro/python3.10/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python3.6/presubmit.cfg b/.kokoro/python3.6/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python3.7/presubmit.cfg b/.kokoro/python3.7/presubmit.cfg
@@ -16,5 +16,5 @@
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python3.8/presubmit.cfg b/.kokoro/python3.8/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/python3.9/presubmit.cfg b/.kokoro/python3.9/presubmit.cfg
@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: ".kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_main.sh"
 }
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -21,16 +21,16 @@ shopt -s globstar
 
 DIFF_FROM=""
 
-# `--only-diff-master` will only run tests on project changes on the
-# last common commit from the master branch.
-if [[ $* == *--only-diff-master* ]]; then
+# `--only-diff-main` will only run tests on project changes on the
+# last common commit from the main branch.
+if [[ $* == *--only-diff-main* ]]; then
     set +e
-    git diff --quiet "origin/master..." .kokoro/tests .kokoro/docker \
+    git diff --quiet "origin/main..." .kokoro/tests .kokoro/docker \
 	.kokoro/trampoline_v2.sh
     CHANGED=$?
     set -e
     if [[ "${CHANGED}" -eq 0 ]]; then
-	DIFF_FROM="origin/master..."
+	DIFF_FROM="origin/main..."
     else
 	echo "Changes to test driver files detected. Running full tests."
     fi
diff --git a/.kokoro/tests/run_tests_diff_main.sh b/.kokoro/tests/run_tests_diff_main.sh
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 mydir="${0%/*}"
-"$mydir"/run_tests.sh --only-diff-master
+"$mydir"/run_tests.sh --only-diff-main
diff --git a/.kokoro/tests/run_tests_orig.sh b/.kokoro/tests/run_tests_orig.sh
@@ -21,16 +21,16 @@ shopt -s globstar
 
 DIFF_FROM=""
 
-# `--only-diff-master` will only run tests on project changes on the
-# last common commit from the master branch.
-if [[ $* == *--only-diff-master* ]]; then
+# `--only-diff-main` will only run tests on project changes on the
+# last common commit from the main branch.
+if [[ $* == *--only-diff-main* ]]; then
     set +e
-    git diff --quiet "origin/master..." .kokoro/tests .kokoro/docker \
+    git diff --quiet "origin/main..." .kokoro/tests .kokoro/docker \
 	.kokoro/trampoline_v2.sh
     CHANGED=$?
     set -e
     if [[ "${CHANGED}" -eq 0 ]]; then
-	DIFF_FROM="origin/master..."
+	DIFF_FROM="origin/main..."
     else
 	echo "Changes to test driver files detected. Running full tests."
     fi

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`# Tell the trampoline which build file to use.`
`18`	`18`	`env_vars: {`
`19`	`19`	`key: "TRAMPOLINE_BUILD_FILE"`
`20`		`- value: ".kokoro/tests/run_tests_diff_master.sh"`
	`20`	`+ value: ".kokoro/tests/run_tests_diff_main.sh"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`
`17`	`17`	`env_vars: {`
`18`	`18`	`key: "TRAMPOLINE_BUILD_FILE"`
`19`		`- value: ".kokoro/tests/run_tests_diff_master.sh"`
	`19`	`+ value: ".kokoro/tests/run_tests_diff_main.sh"`
`20`	`20`	`}`