From dfc45cfbac31dcd6505c6f9ea7f046f5ede44ad5 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 14:35:05 -0600
Subject: [PATCH] build: use trampoline_v2 for python samples and allow custom
 dockerfile (#63)

Source-Link: https://github.com/googleapis/synthtool/commit/a7ed11ec0863c422ba2e73aafa75eab22c32b33d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:6e7328583be8edd3ba8f35311c76a1ecbc823010279ccb6ab46b7a76e25eafcc

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 packages/googleapis-common-protos/.github/.OwlBot.lock.yaml     | 2 +-
 .../googleapis-common-protos/.kokoro/samples/lint/common.cfg    | 2 +-
 .../.kokoro/samples/python3.6/common.cfg                        | 2 +-
 .../.kokoro/samples/python3.6/periodic.cfg                      | 2 +-
 .../.kokoro/samples/python3.7/common.cfg                        | 2 +-
 .../.kokoro/samples/python3.7/periodic.cfg                      | 2 +-
 .../.kokoro/samples/python3.8/common.cfg                        | 2 +-
 .../.kokoro/samples/python3.8/periodic.cfg                      | 2 +-
 .../.kokoro/samples/python3.9/common.cfg                        | 2 +-
 .../.kokoro/samples/python3.9/periodic.cfg                      | 2 +-
 .../.kokoro/test-samples-against-head.sh                        | 2 --
 packages/googleapis-common-protos/.kokoro/test-samples.sh       | 2 --
 12 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/googleapis-common-protos/.github/.OwlBot.lock.yaml b/packages/googleapis-common-protos/.github/.OwlBot.lock.yaml
index 2567653c000d..ee94722ab57b 100644
--- a/packages/googleapis-common-protos/.github/.OwlBot.lock.yaml
+++ b/packages/googleapis-common-protos/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a
+  digest: sha256:6e7328583be8edd3ba8f35311c76a1ecbc823010279ccb6ab46b7a76e25eafcc
diff --git a/packages/googleapis-common-protos/.kokoro/samples/lint/common.cfg b/packages/googleapis-common-protos/.kokoro/samples/lint/common.cfg
index 2d1fa4d535f0..df6494e12925 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/lint/common.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/lint/common.cfg
@@ -31,4 +31,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-api-common-protos/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-api-common-protos/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.6/common.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.6/common.cfg
index 3ed0cd020bfd..3d9b96bad77e 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.6/common.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.6/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-api-common-protos/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-api-common-protos/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.6/periodic.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.6/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.6/periodic.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.6/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.7/common.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.7/common.cfg
index cffeb1556a96..5f0a7980fc2b 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.7/common.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.7/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-api-common-protos/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-api-common-protos/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.7/periodic.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.7/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.7/periodic.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.7/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.8/common.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.8/common.cfg
index 53cc56ead78a..d87884234f21 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.8/common.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.8/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-api-common-protos/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-api-common-protos/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.8/periodic.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.8/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.8/periodic.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.8/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.9/common.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.9/common.cfg
index bf253bf2caa9..d0c1c8c9b996 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.9/common.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.9/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-api-common-protos/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-api-common-protos/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/googleapis-common-protos/.kokoro/samples/python3.9/periodic.cfg b/packages/googleapis-common-protos/.kokoro/samples/python3.9/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/googleapis-common-protos/.kokoro/samples/python3.9/periodic.cfg
+++ b/packages/googleapis-common-protos/.kokoro/samples/python3.9/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/googleapis-common-protos/.kokoro/test-samples-against-head.sh b/packages/googleapis-common-protos/.kokoro/test-samples-against-head.sh
index 04ef660b1acc..ba3a707b040c 100755
--- a/packages/googleapis-common-protos/.kokoro/test-samples-against-head.sh
+++ b/packages/googleapis-common-protos/.kokoro/test-samples-against-head.sh
@@ -23,6 +23,4 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-api-common-protos
-
 exec .kokoro/test-samples-impl.sh
diff --git a/packages/googleapis-common-protos/.kokoro/test-samples.sh b/packages/googleapis-common-protos/.kokoro/test-samples.sh
index 4bfe889c17bc..11c042d342d7 100755
--- a/packages/googleapis-common-protos/.kokoro/test-samples.sh
+++ b/packages/googleapis-common-protos/.kokoro/test-samples.sh
@@ -24,8 +24,6 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-api-common-protos
-
 # Run periodic samples tests at latest release
 if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
     # preserving the test runner implementation.