From 835e10b4506f90895dd04caec37ecc3f821d67ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Tue, 22 Apr 2025 10:53:34 +0200 Subject: [PATCH] build: use span-cloud-testing for integration tests --- .kokoro/build.sh | 2 ++ .kokoro/presubmit/integration.cfg | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f4ea82a43..236faa2ad 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -76,6 +76,8 @@ integration) -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ + -Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-test \ + -Dspanner.gce.config.project_id=span-cloud-testing \ -fae \ verify RETURN_CODE=$? diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index 5864c603e..929a8b346 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -11,24 +11,13 @@ 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" }