diff --git a/.kokoro/build.sh b/.kokoro/build.sh index bac4f03ceb3..0656ab0e424 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -98,9 +98,8 @@ integration) -Dclirr.skip=true \ -Denforcer.skip=true \ -Dmaven.main.skip=true \ - -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ - -Dspanner.gce.config.project_id=span-cloud-testing \ - -Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-tests \ + -Dspanner.gce.config.project_id=gcloud-devel \ + -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \ -fae \ verify RETURN_CODE=$? @@ -114,7 +113,6 @@ integration-directpath-enabled) -Dclirr.skip=true \ -Denforcer.skip=true \ -Dmaven.main.skip=true \ - -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \ -Dspanner.gce.config.project_id=span-cloud-testing \ -fae \ @@ -130,9 +128,8 @@ integration-multiplexed-sessions-enabled) -Dclirr.skip=true \ -Denforcer.skip=true \ -Dmaven.main.skip=true \ - -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ - -Dspanner.gce.config.project_id=span-cloud-testing \ - -Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-tests-multiplexed-sessions \ + -Dspanner.gce.config.project_id=gcloud-devel \ + -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-multiplexed-sessions \ -fae \ verify RETURN_CODE=$? diff --git a/.kokoro/presubmit/integration-directpath-enabled.cfg b/.kokoro/presubmit/integration-directpath-enabled.cfg index c7b3d45e771..ceb3bddfa70 100644 --- a/.kokoro/presubmit/integration-directpath-enabled.cfg +++ b/.kokoro/presubmit/integration-directpath-enabled.cfg @@ -11,6 +11,17 @@ env_vars: { value: "integration-directpath-enabled" } +# 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: "secret_manager/java-client-testing" diff --git a/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg b/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg index 28b95345f71..800e2a21558 100644 --- a/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg +++ b/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg @@ -11,14 +11,25 @@ env_vars: { value: "integration-multiplexed-sessions-enabled" } +# 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: "secret_manager/java-client-testing" + value: "secret_manager/java-it-service-account" } env_vars: { key: "SECRET_MANAGER_KEYS" - value: "java-client-testing" + value: "java-it-service-account" } env_vars: { diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index cc4e22eaf9a..5864c603e5a 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -11,12 +11,24 @@ env_vars: { 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: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-client-testing" + value: "secret_manager/java-it-service-account" } env_vars: { key: "SECRET_MANAGER_KEYS" - value: "java-client-testing" + value: "java-it-service-account" } +