From 538951b94bd69e46977e1ab67785525d3fd5e978 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Sep 2018 18:11:07 -0700 Subject: [PATCH 1/2] node: test_project arg for circleci config --- synthtool/gcp/templates/node_library/.circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synthtool/gcp/templates/node_library/.circleci/config.yml b/synthtool/gcp/templates/node_library/.circleci/config.yml index 8af6a4d04..ecf25dbe7 100644 --- a/synthtool/gcp/templates/node_library/.circleci/config.yml +++ b/synthtool/gcp/templates/node_library/.circleci/config.yml @@ -128,7 +128,7 @@ jobs: name: Run sample tests. command: npm run samples-test environment: - GCLOUD_PROJECT: long-door-651 + GCLOUD_PROJECT: {{ test_project or 'long-door-651' }} GOOGLE_APPLICATION_CREDENTIALS: /home/node/samples/.circleci/key.json NPM_CONFIG_PREFIX: /home/node/.npm-global - run: @@ -160,7 +160,7 @@ jobs: name: Run system tests. command: npm run system-test environment: - GCLOUD_PROJECT: long-door-651 + GCLOUD_PROJECT: {{ test_project or 'long-door-651' }} GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json - run: name: Remove unencrypted key. From 3d3c4e905327beab0402104ff9cd0bd8119cf831 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Sep 2018 18:12:29 -0700 Subject: [PATCH 2/2] test-project arg for .kokoro also --- synthtool/gcp/templates/node_library/.kokoro/samples-test.sh | 2 +- synthtool/gcp/templates/node_library/.kokoro/system-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh b/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh index 76edbbbb2..28daa1401 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh @@ -20,7 +20,7 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json -export GCLOUD_PROJECT=long-door-651 +export GCLOUD_PROJECT={{ test_project or 'long-door-651' }} cd $(dirname $0)/.. diff --git a/synthtool/gcp/templates/node_library/.kokoro/system-test.sh b/synthtool/gcp/templates/node_library/.kokoro/system-test.sh index a954b7942..0986db582 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/system-test.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/system-test.sh @@ -20,7 +20,7 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json -export GCLOUD_PROJECT=long-door-651 +export GCLOUD_PROJECT={{ test_project or 'long-door-651' }} cd $(dirname $0)/..