From a314234ff034364fdbde6916ed0b884676a53325 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 8 Apr 2021 18:42:33 -0400 Subject: [PATCH 1/2] buildscript: use different xds-k8s cluster In preparation to the Public Preview. --- buildscripts/kokoro/xds-k8s.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/kokoro/xds-k8s.sh b/buildscripts/kokoro/xds-k8s.sh index 0ec6863db71..6270298379b 100755 --- a/buildscripts/kokoro/xds-k8s.sh +++ b/buildscripts/kokoro/xds-k8s.sh @@ -4,8 +4,8 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc-java" # GKE Cluster -readonly GKE_CLUSTER_NAME="interop-test-psm-sec1-us-central1" -readonly GKE_CLUSTER_ZONE="us-central1-a" +readonly GKE_CLUSTER_NAME="interop-test-psm-sec-testing-api" +readonly GKE_CLUSTER_ZONE="us-west1-b" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client" From 0de1ef0041e70f14d0a85bec5a5e9074f51399bc Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 8 Apr 2021 19:53:34 -0400 Subject: [PATCH 2/2] buildscript: add xds-k8s cluster endpoint override Missed this in 1b86618ce9db1a6bc2e0ec5fac1b28eb716fc47d --- buildscripts/kokoro/xds-k8s.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/buildscripts/kokoro/xds-k8s.sh b/buildscripts/kokoro/xds-k8s.sh index 6270298379b..23c046c7aef 100755 --- a/buildscripts/kokoro/xds-k8s.sh +++ b/buildscripts/kokoro/xds-k8s.sh @@ -6,6 +6,7 @@ readonly GITHUB_REPOSITORY_NAME="grpc-java" # GKE Cluster readonly GKE_CLUSTER_NAME="interop-test-psm-sec-testing-api" readonly GKE_CLUSTER_ZONE="us-west1-b" +export CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER="https://test-container.sandbox.googleapis.com/" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"