Skip to content

Commit b336029

Browse files
author
Takashi Matsuo
authored
Merge branch 'master' into fix-crypto-key-path
2 parents b9547b3 + f877a9a commit b336029

File tree

285 files changed

+6593
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+6593
-1728
lines changed

‎.kokoro/lint/continuous.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: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.sh"
2121
}

‎.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: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
2121
}

‎.kokoro/python2.7/continuous.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: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.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: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
2121
}

‎.kokoro/python3.6/continuous.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: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.sh"
2121
}

‎.kokoro/python3.6/periodic.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
# Format: //devtools/kokoro/config/proto/build.proto
1616

17+
timeout_mins: 420 # 7 hours
18+
1719
# Tell the trampoline which build file to use.
1820
env_vars: {
1921
key: "TRAMPOLINE_BUILD_FILE"

‎.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: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
2121
}

‎.kokoro/python3.7/continuous.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: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.sh"
2121
}

‎.kokoro/python3.7/periodic.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
# Format: //devtools/kokoro/config/proto/build.proto
1616

17+
timeout_mins: 420 # 7 hours
18+
1719
# Tell the trampoline which build file to use.
1820
env_vars: {
1921
key: "TRAMPOLINE_BUILD_FILE"

‎.kokoro/python3.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: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
2121
}

0 commit comments

Comments
 (0)