From 681e6d785acdfe41150b0da0543f1763a8e2e0c1 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 11:15:20 -0600 Subject: [PATCH] build: use trampoline_v2 for python samples and allow custom dockerfile (#85) 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 --- .../.github/.OwlBot.lock.yaml | 2 +- .../.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 -- .../.kokoro/test-samples.sh | 2 -- packages/google-cloud-gke-hub/.trampolinerc | 17 ++++++++++++++--- 13 files changed, 24 insertions(+), 17 deletions(-) diff --git a/packages/google-cloud-gke-hub/.github/.OwlBot.lock.yaml b/packages/google-cloud-gke-hub/.github/.OwlBot.lock.yaml index 2567653c000d..ee94722ab57b 100644 --- a/packages/google-cloud-gke-hub/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-gke-hub/.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/google-cloud-gke-hub/.kokoro/samples/lint/common.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/lint/common.cfg index 94f5e364b9b2..e53b4b02c4af 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/lint/common.cfg +++ b/packages/google-cloud-gke-hub/.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-gke-hub/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-gke-hub/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/common.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/common.cfg index 7000005c4fa1..a9648505126e 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/common.cfg +++ b/packages/google-cloud-gke-hub/.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-gke-hub/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-gke-hub/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/periodic.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.6/periodic.cfg +++ b/packages/google-cloud-gke-hub/.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/google-cloud-gke-hub/.kokoro/samples/python3.7/common.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.7/common.cfg index 8ba43d5e34bd..506243c36443 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.7/common.cfg +++ b/packages/google-cloud-gke-hub/.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-gke-hub/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-gke-hub/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-gke-hub/.kokoro/samples/python3.7/periodic.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.7/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.7/periodic.cfg +++ b/packages/google-cloud-gke-hub/.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/google-cloud-gke-hub/.kokoro/samples/python3.8/common.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.8/common.cfg index 1d326f4078c3..d3e2f971f7aa 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.8/common.cfg +++ b/packages/google-cloud-gke-hub/.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-gke-hub/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-gke-hub/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-gke-hub/.kokoro/samples/python3.8/periodic.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.8/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.8/periodic.cfg +++ b/packages/google-cloud-gke-hub/.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/google-cloud-gke-hub/.kokoro/samples/python3.9/common.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.9/common.cfg index 9e9ccca6bca6..c28a9dcfb7af 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.9/common.cfg +++ b/packages/google-cloud-gke-hub/.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-gke-hub/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-gke-hub/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-gke-hub/.kokoro/samples/python3.9/periodic.cfg b/packages/google-cloud-gke-hub/.kokoro/samples/python3.9/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-gke-hub/.kokoro/samples/python3.9/periodic.cfg +++ b/packages/google-cloud-gke-hub/.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/google-cloud-gke-hub/.kokoro/test-samples-against-head.sh b/packages/google-cloud-gke-hub/.kokoro/test-samples-against-head.sh index 4d9d477b9004..ba3a707b040c 100755 --- a/packages/google-cloud-gke-hub/.kokoro/test-samples-against-head.sh +++ b/packages/google-cloud-gke-hub/.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-gke-hub - exec .kokoro/test-samples-impl.sh diff --git a/packages/google-cloud-gke-hub/.kokoro/test-samples.sh b/packages/google-cloud-gke-hub/.kokoro/test-samples.sh index ce024a826945..11c042d342d7 100755 --- a/packages/google-cloud-gke-hub/.kokoro/test-samples.sh +++ b/packages/google-cloud-gke-hub/.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-gke-hub - # Run periodic samples tests at latest release if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then # preserving the test runner implementation. diff --git a/packages/google-cloud-gke-hub/.trampolinerc b/packages/google-cloud-gke-hub/.trampolinerc index 383b6ec89fbc..0eee72ab62aa 100644 --- a/packages/google-cloud-gke-hub/.trampolinerc +++ b/packages/google-cloud-gke-hub/.trampolinerc @@ -16,15 +16,26 @@ # Add required env vars here. required_envvars+=( - "STAGING_BUCKET" - "V2_STAGING_BUCKET" ) # Add env vars which are passed down into the container here. pass_down_envvars+=( + "NOX_SESSION" + ############### + # Docs builds + ############### "STAGING_BUCKET" "V2_STAGING_BUCKET" - "NOX_SESSION" + ################## + # Samples builds + ################## + "INSTALL_LIBRARY_FROM_SOURCE" + "RUN_TESTS_SESSION" + "BUILD_SPECIFIC_GCLOUD_PROJECT" + # Target directories. + "RUN_TESTS_DIRS" + # The nox session to run. + "RUN_TESTS_SESSION" ) # Prevent unintentional override on the default image.