diff --git a/packages/google-cloud-service-management/.github/.OwlBot.lock.yaml b/packages/google-cloud-service-management/.github/.OwlBot.lock.yaml index 2567653c000d..ee94722ab57b 100644 --- a/packages/google-cloud-service-management/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/samples/lint/common.cfg b/packages/google-cloud-service-management/.kokoro/samples/lint/common.cfg index 3de81e6894ae..32036006b2f4 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/lint/common.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-service-management/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-service-management/.kokoro/samples/python3.6/common.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.6/common.cfg index 1eb767fa45ef..f40151d7acfc 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.6/common.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-service-management/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-service-management/.kokoro/samples/python3.6/periodic.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.6/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.6/periodic.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/samples/python3.7/common.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.7/common.cfg index 209434095259..57e22cb3095f 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.7/common.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-service-management/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-service-management/.kokoro/samples/python3.7/periodic.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.7/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.7/periodic.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/samples/python3.8/common.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.8/common.cfg index 0dac4e360863..15e27a934845 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.8/common.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-service-management/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-service-management/.kokoro/samples/python3.8/periodic.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.8/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.8/periodic.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/samples/python3.9/common.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.9/common.cfg index a6afe33ead2f..e19749b5be18 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.9/common.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/trampoline.sh" \ No newline at end of file +build_file: "python-service-management/.kokoro/trampoline_v2.sh" \ No newline at end of file diff --git a/packages/google-cloud-service-management/.kokoro/samples/python3.9/periodic.cfg b/packages/google-cloud-service-management/.kokoro/samples/python3.9/periodic.cfg index 50fec9649732..71cd1e597e38 100644 --- a/packages/google-cloud-service-management/.kokoro/samples/python3.9/periodic.cfg +++ b/packages/google-cloud-service-management/.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-service-management/.kokoro/test-samples-against-head.sh b/packages/google-cloud-service-management/.kokoro/test-samples-against-head.sh index ec199bbc0f3b..ba3a707b040c 100755 --- a/packages/google-cloud-service-management/.kokoro/test-samples-against-head.sh +++ b/packages/google-cloud-service-management/.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-service-management - exec .kokoro/test-samples-impl.sh diff --git a/packages/google-cloud-service-management/.kokoro/test-samples.sh b/packages/google-cloud-service-management/.kokoro/test-samples.sh index d6c775cb7f4b..11c042d342d7 100755 --- a/packages/google-cloud-service-management/.kokoro/test-samples.sh +++ b/packages/google-cloud-service-management/.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-service-management - # 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-service-management/.trampolinerc b/packages/google-cloud-service-management/.trampolinerc index 383b6ec89fbc..0eee72ab62aa 100644 --- a/packages/google-cloud-service-management/.trampolinerc +++ b/packages/google-cloud-service-management/.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.