ci: use prebuilt docker image in presubmits (GoogleCloudPlatform#9108)

parthea · kweinmeister · web-flow · commit d6a1b39e35f2 · 2023-02-10T12:36:01.000-06:00
* 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 &lt;11586922+kweinmeister@users.noreply.github.com&gt;
diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
@@ -156,7 +156,7 @@ RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/ge
   # https://github.com/docker-library/python/pull/100
   && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
 
-# Ensure Pip for all python3 versions
+# Ensure Pip for all python3 versions.
 RUN python3.9 /tmp/get-pip.py
 RUN python3.8 /tmp/get-pip.py
 RUN python3.7 /tmp/get-pip.py
diff --git a/.kokoro/lint/common.cfg b/.kokoro/lint/common.cfg
@@ -44,8 +44,3 @@ env_vars: {
     key: "RUN_TESTS_SESSION"
     value: "lint"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python2.7/common.cfg b/.kokoro/python2.7/common.cfg
@@ -52,8 +52,3 @@ env_vars: {
     key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
     value: "python-docs-samples-tests"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.10/common.cfg b/.kokoro/python3.10/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.7/common.cfg b/.kokoro/python3.7/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.8/common.cfg b/.kokoro/python3.8/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.kokoro/python3.9/common.cfg b/.kokoro/python3.9/common.cfg
@@ -59,8 +59,3 @@ env_vars: {
     key: "NUM_TEST_WORKERS"
     value: "10"
 }
-
-env_vars: {
-    key: "TRAMPOLINE_DOCKERFILE"
-    value: ".kokoro/docker/Dockerfile"
-}
diff --git a/.trampolinerc b/.trampolinerc
@@ -47,7 +47,7 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
 fi
 
 if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
-    TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
+    TRAMPOLINE_DOCKERFILE=""
 fi
 
 if [[ -z "${RUN_TESTS_SESSION:-}" ]]; then

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,3 @@ env_vars: {`
`44`	`44`	`key: "RUN_TESTS_SESSION"`
`45`	`45`	`value: "lint"`
`46`	`46`	`}`
`47`		`-`
`48`		`-env_vars: {`
`49`		`- key: "TRAMPOLINE_DOCKERFILE"`
`50`		`- value: ".kokoro/docker/Dockerfile"`
`51`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,3 @@ env_vars: {`
`52`	`52`	`key: "BUILD_SPECIFIC_GCLOUD_PROJECT"`
`53`	`53`	`value: "python-docs-samples-tests"`
`54`	`54`	`}`
`55`		`-`
`56`		`-env_vars: {`
`57`		`- key: "TRAMPOLINE_DOCKERFILE"`
`58`		`- value: ".kokoro/docker/Dockerfile"`
`59`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,3 @@ env_vars: {`
`59`	`59`	`key: "NUM_TEST_WORKERS"`
`60`	`60`	`value: "10"`
`61`	`61`	`}`
`62`		`-`
`63`		`-env_vars: {`
`64`		`- key: "TRAMPOLINE_DOCKERFILE"`
`65`		`- value: ".kokoro/docker/Dockerfile"`
`66`		`-}`