Skip to content

Commit d6a1b39

Browse files
ci: use prebuilt docker image in presubmits (#9108)
* ci: use prebuilt docker image in presubmits * update lint session * Unset TRAMPOLINE_DOCKERFILE by default * Make a change to the Dockerfile to trigger all tests to run. --------- Co-authored-by: Karl Weinmeister <[email protected]>
1 parent fa614fe commit d6a1b39

File tree

8 files changed

+2
-32
lines changed

8 files changed

+2
-32
lines changed

.kokoro/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/ge
156156
# https://github.com/docker-library/python/pull/100
157157
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
158158

159-
# Ensure Pip for all python3 versions
159+
# Ensure Pip for all python3 versions.
160160
RUN python3.9 /tmp/get-pip.py
161161
RUN python3.8 /tmp/get-pip.py
162162
RUN python3.7 /tmp/get-pip.py

.kokoro/lint/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,3 @@ env_vars: {
4444
key: "RUN_TESTS_SESSION"
4545
value: "lint"
4646
}
47-
48-
env_vars: {
49-
key: "TRAMPOLINE_DOCKERFILE"
50-
value: ".kokoro/docker/Dockerfile"
51-
}

.kokoro/python2.7/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,3 @@ env_vars: {
5252
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
5353
value: "python-docs-samples-tests"
5454
}
55-
56-
env_vars: {
57-
key: "TRAMPOLINE_DOCKERFILE"
58-
value: ".kokoro/docker/Dockerfile"
59-
}

.kokoro/python3.10/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,3 @@ env_vars: {
5959
key: "NUM_TEST_WORKERS"
6060
value: "10"
6161
}
62-
63-
env_vars: {
64-
key: "TRAMPOLINE_DOCKERFILE"
65-
value: ".kokoro/docker/Dockerfile"
66-
}

.kokoro/python3.7/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,3 @@ env_vars: {
5959
key: "NUM_TEST_WORKERS"
6060
value: "10"
6161
}
62-
63-
env_vars: {
64-
key: "TRAMPOLINE_DOCKERFILE"
65-
value: ".kokoro/docker/Dockerfile"
66-
}

.kokoro/python3.8/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,3 @@ env_vars: {
5959
key: "NUM_TEST_WORKERS"
6060
value: "10"
6161
}
62-
63-
env_vars: {
64-
key: "TRAMPOLINE_DOCKERFILE"
65-
value: ".kokoro/docker/Dockerfile"
66-
}

.kokoro/python3.9/common.cfg

-5
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,3 @@ env_vars: {
5959
key: "NUM_TEST_WORKERS"
6060
value: "10"
6161
}
62-
63-
env_vars: {
64-
key: "TRAMPOLINE_DOCKERFILE"
65-
value: ".kokoro/docker/Dockerfile"
66-
}

.trampolinerc

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
4747
fi
4848

4949
if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
50-
TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
50+
TRAMPOLINE_DOCKERFILE=""
5151
fi
5252

5353
if [[ -z "${RUN_TESTS_SESSION:-}" ]]; then

0 commit comments

Comments
 (0)