8000 test: update Kokoro to use main branch (#7167) · orossini/python-docs-samples@089ae80 · GitHub
[go: up one dir, main page]
Skip to content

Commit 089ae80

Browse files
dandhleedandhlee
authored
test: update Kokoro to use main branch (GoogleCloudPlatform#7167)
1 parent 4fe345a commit 089ae80
Copy full SHA for 089ae80

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

‎.kokoro/lint/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/python2.7/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/python3.10/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/python3.6/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/python3.7/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
env_vars: {
1818
key: "TRAMPOLINE_BUILD_FILE"
19-
value: ".kokoro/tests/run_tests_diff_master.sh"
19+
value: ".kokoro/tests/run_tests_diff_main.sh"
2020
}

‎.kokoro/python3.8/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/python3.9/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
20-
value: ".kokoro/tests/run_tests_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_main.sh"
2121
}

‎.kokoro/tests/run_tests.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ shopt -s globstar
2121

2222
DIFF_FROM=""
2323

24-
# `--only-diff-master` will only run tests on project changes on the
25-
# last common commit from the master branch.
26-
if [[ $* == *--only-diff-master* ]]; then
24+
# `--only-diff-main` will only run tests on project changes on the
25+
# last common commit from the main branch.
26+
if [[ $* == *--only-diff-main* ]]; then
2727
set +e
28-
git diff --quiet "origin/master..." .kokoro/tests .kokoro/docker \
28+
git diff --quiet "origin/main..." .kokoro/tests .kokoro/docker \
2929
.kokoro/trampoline_v2.sh
3030
CHANGED=$?
3131
set -e
3232
if [[ "${CHANGED}" -eq 0 ]]; then
33-
DIFF_FROM="origin/master..."
33+
DIFF_FROM="origin/main..."
3434
else
3535
echo "Changes to test driver files detected. Running full tests."
3636
fi

‎.kokoro/tests/run_tests_diff_master.sh renamed to ‎.kokoro/tests/run_tests_diff_main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
mydir="${0%/*}"
16-
"$mydir"/run_tests.sh --only-diff-master
16+
"$mydir"/run_tests.sh --only-diff-main

‎.kokoro/tests/run_tests_orig.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ shopt -s globstar
2121

2222
DIFF_FROM=""
2323

24-
# `--only-diff-master` will only run tests on project changes on the
25-
# last common commit from the master branch.
26-
if [[ $* == *--only-diff-master* ]]; then
24+
# `--only-diff-main` will only run tests on project changes on the
25+
# last common commit from the main branch.
26+
if [[ $* == *--only-diff-main* ]]; then
2727
set +e
28-
git diff --quiet "origin/master..." .kokoro/tests .kokoro/docker \
28+
git diff --quiet "origin/main..." .kokoro/tests .kokoro/docker \
2929
.kokoro/trampoline_v2.sh
3030
CHANGED=$?
3131
set -e
3232
if [[ "${CHANGED}" -eq 0 ]]; then
33-
DIFF_FROM="origin/master..."
33+
DIFF_FROM="origin/main..."
3434
else
3535
echo "Changes to test driver files detected. Running full tests."
3636
fi

0 commit comments

Comments
 (0)
0