Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8f55cf8

Browse files
author
Takashi Matsuo
committed
Trial to run the trampoline_v2 in Kokoro.
1 parent 6fdfc09 commit 8f55cf8

20 files changed

+50
-27
lines changed

.kokoro/lint/common.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env_vars: {
2424
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
2525

2626
# Use the trampoline script to run in docker.
27-
build_file: "python-docs-samples/.kokoro/trampoline.sh"
27+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
2828

2929
# Download secrets from Cloud Storage.
3030
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -41,3 +41,8 @@ env_vars: {
4141
key: "RUN_TESTS_SESSION"
4242
value: "lint"
4343
}
44+
45+
env_vars: {
46+
key: "TRAMPOLINE_DOCKERFILE"
47+
value: ".kokoro/docker/Dockerfile"
48+
}

.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_diff_head.sh"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
2121
}

.kokoro/lint/periodic.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: ".kokoro/tests/run_tests.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_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_master.sh"
2121
}

.kokoro/python2.7/common.cfg

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env_vars: {
2626
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
2727

2828
# Use the trampoline script to run in docker.
29-
build_file: "python-docs-samples/.kokoro/trampoline.sh"
29+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
3030

3131
# Download secrets from Cloud Storage.
3232
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -44,9 +44,13 @@ env_vars: {
4444
value: "py-2.7"
4545
}
4646

47-
# Declare build specific Cloud project. It still uses the common one,
48-
# but we'll update the value once we have more Cloud projects.
47+
# Declare build specific Cloud project.
4948
env_vars: {
5049
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
5150
value: "python-docs-samples-tests"
5251
}
52+
53+
env_vars: {
54+
key: "TRAMPOLINE_DOCKERFILE"
55+
value: ".kokoro/docker/Dockerfile"
56+
}

.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_diff_head.sh"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
2121
}

.kokoro/python2.7/periodic.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
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: ".kokoro/tests/run_tests.sh"
2121
}
2222

2323
env_vars: {
2424
key: "REPORT_TO_BUILD_COP_BOT"
25-
value: "True"
25+
value: "true"
2626
}

.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_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_master.sh"
2121
}

.kokoro/python3.6/common.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env_vars: {
2626
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
2727

2828
# Use the trampoline script to run in docker.
29-
build_file: "python-docs-samples/.kokoro/trampoline.sh"
29+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
3030

3131
# Download secrets from Cloud Storage.
3232
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -50,3 +50,8 @@ env_vars: {
5050
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
5151
value: "python-docs-samples-tests-py36"
5252
}
53+
54+
env_vars: {
55+
key: "TRAMPOLINE_DOCKERFILE"
56+
value: ".kokoro/docker/Dockerfile"
57+
}

.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_diff_head.sh"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
2121
}

.kokoro/python3.6/periodic.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
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: ".kokoro/tests/run_tests.sh"
2121
}
2222

2323
env_vars: {
2424
key: "REPORT_TO_BUILD_COP_BOT"
25-
value: "True"
25+
value: "true"
2626
}

.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_diff_master.sh"
20+
value: ".kokoro/tests/run_tests_diff_master.sh"
2121
}

.kokoro/python3.7/common.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env_vars: {
2626
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
2727

2828
# Use the trampoline script to run in docker.
29-
build_file: "python-docs-samples/.kokoro/trampoline.sh"
29+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
3030

3131
# Download secrets from Cloud Storage.
3232
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -50,3 +50,8 @@ env_vars: {
5050
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
5151
value: "python-docs-samples-tests-py37"
5252
}
53+
54+
env_vars: {
55+
key: "TRAMPOLINE_DOCKERFILE"
56+
value: ".kokoro/docker/Dockerfile"
57+
}

.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_diff_head.sh"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
2121
}

.kokoro/python3.7/periodic.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
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: ".kokoro/tests/run_tests.sh"
2121
}
2222

2323
env_vars: {
2424
key: "REPORT_TO_BUILD_COP_BOT"
25-
value: "True"
25+
value: "true"
2626
}

.kokoro/python3.7/presubmit.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

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

17-
# Tell the trampoline which build file to use.
1817
env_vars: {
1918
key: "TRAMPOLINE_BUILD_FILE"
20-
value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
19+
value: ".kokoro/tests/run_tests_diff_master.sh"
2120
}

.kokoro/python3.8/common.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env_vars: {
2626
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
2727

2828
# Use the trampoline script to run in docker.
29-
build_file: "python-docs-samples/.kokoro/trampoline.sh"
29+
build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
3030

3131
# Download secrets from Cloud Storage.
3232
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -50,3 +50,8 @@ env_vars: {
5050
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
5151
value: "python-docs-samples-tests-py38"
5252
}
53+
54+
env_vars: {
55+
key: "TRAMPOLINE_DOCKERFILE"
56+
value: ".kokoro/docker/Dockerfile"
57+
}

.kokoro/python3.8/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_diff_head.sh"
20+
value: ".kokoro/tests/run_tests_diff_head.sh"
2121
}

.kokoro/python3.8/periodic.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
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: ".kokoro/tests/run_tests.sh"
2121
}
2222

2323
env_vars: {
2424
key: "REPORT_TO_BUILD_COP_BOT"
25-
value: "True"
25+
value: "true"
2626
}

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

0 commit comments

Comments
 (0)