From d1fea4610dcb24425b78a3d651df3adb34f1395d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 10 Apr 2020 11:09:19 -0700 Subject: [PATCH 1/2] build(java): set GOOGLE_CLOUD_PROJECT env variable for samples/integration tests --- .../java_library/.kokoro/nightly/integration.cfg | 11 ++++++++--- .../java_library/.kokoro/nightly/samples.cfg | 6 ++++++ .../java_library/.kokoro/presubmit/integration.cfg | 14 ++++++++++---- .../java_library/.kokoro/presubmit/samples.cfg | 14 ++++++++++---- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg index ca0274800..40c4abb7b 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg @@ -10,20 +10,25 @@ env_vars: { key: "JOB_TYPE" value: "integration" } - +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" value: "gcloud-devel" } +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "ENABLE_BUILD_COP" value: "true" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg index b4b051cd0..c08e88402 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg @@ -11,11 +11,17 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" value: "gcloud-devel" } +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" value: "keystore/73713_java_it_service_account" diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg index 141f90c13..522e5b101 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg @@ -11,14 +11,20 @@ env_vars: { value: "integration" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg index fa7b493d0..882db6db3 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg @@ -11,14 +11,20 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { From 3e26f7e5dac98e9bef1cf0a1a46f2484405e2c73 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 13 Apr 2020 11:34:06 -0700 Subject: [PATCH 2/2] ci: use java-docs-samples-testing for sample tests --- .../gcp/templates/java_library/.kokoro/nightly/samples.cfg | 4 ++-- .../gcp/templates/java_library/.kokoro/presubmit/samples.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg index c08e88402..20aabd55d 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg @@ -14,12 +14,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg index 882db6db3..1171aead0 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg +++ b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg @@ -14,12 +14,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: {