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