diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh index 31157f5a9159b..744d7e10cef0e 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh @@ -34,16 +34,6 @@ GRPC_NODE_GITREF=master TEST_INFRA_REPO=grpc/test-infra TEST_INFRA_GITREF=master -# This is to ensure we can push and pull images from Artifact Registry. We do -# not necessarily need it to run load tests, but will need it when we employ -# pre-built images in the optimization. -gcloud auth configure-docker - -# Connect to benchmarks-prod2 cluster. -gcloud config set project grpc-testing -gcloud container clusters get-credentials benchmarks-prod2 \ - --zone us-central1-b --project grpc-testing - # Set up environment variables. LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}" # BEGIN differentiate experimental configuration from master configuration. @@ -83,6 +73,16 @@ WORKER_POOL_32CORE=workers-c2-30core-ci # Prefix for log URLs in cnsviewer. LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" +# This is to ensure we can push and pull images from Artifact Registry. We do +# not necessarily need it to run load tests, but will need it when we employ +# pre-built images in the optimization. +gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" + +# Connect to benchmarks-prod2 cluster. +gcloud config set project grpc-testing +gcloud container clusters get-credentials benchmarks-prod2 \ + --zone us-central1-b --project grpc-testing + # Clone test-infra repository and build all tools. mkdir ../test-infra pushd ../test-infra diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh index bc23de44e5dab..7656e516205cf 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh @@ -35,16 +35,6 @@ GRPC_CORE_GITREF=master TEST_INFRA_REPO=grpc/test-infra TEST_INFRA_GITREF=master -# This is to ensure we can push and pull images from gcr.io. We do not -# necessarily need it to run load tests, but will need it when we employ -# pre-built images in the optimization. -gcloud auth configure-docker - -# Connect to benchmarks-prod2 cluster. -gcloud config set project grpc-testing -gcloud container clusters get-credentials benchmarks-prod2 \ - --zone us-central1-b --project grpc-testing - # Set up environment variables. LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}" # BEGIN differentiate experimental configuration from master configuration. @@ -77,6 +67,16 @@ WORKER_POOL_32CORE=workers-c2-30core-ci # Prefix for log URLs in cnsviewer. LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" +# This is to ensure we can push and pull images from Artifact Registry. We do +# not necessarily need it to run load tests, but will need it when we employ +# pre-built images in the optimization. +gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" + +# Connect to benchmarks-prod2 cluster. +gcloud config set project grpc-testing +gcloud container clusters get-credentials benchmarks-prod2 \ + --zone us-central1-b --project grpc-testing + # Clone test-infra repository and build all tools. mkdir ../test-infra pushd ../test-infra diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh index 757dbb4a3f1a2..e56ca30b37c65 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh @@ -34,16 +34,6 @@ GRPC_NODE_GITREF=master TEST_INFRA_REPO=grpc/test-infra TEST_INFRA_GITREF=master -# This is to ensure we can push and pull images from Artifact Registry. We do -# not necessarily need it to run load tests, but will need it when we employ -# pre-built images in the optimization. -gcloud auth configure-docker - -# Connect to benchmarks-prod2 cluster. -gcloud config set project grpc-testing -gcloud container clusters get-credentials benchmarks-prod2 \ - --zone us-central1-b --project grpc-testing - # Set up environment variables. LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}" # BEGIN differentiate experimental configuration from master configuration. @@ -78,6 +68,16 @@ WORKER_POOL_32CORE=workers-c2-30core-ci # Prefix for log URLs in cnsviewer. LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" +# This is to ensure we can push and pull images from Artifact Registry. We do +# not necessarily need it to run load tests, but will need it when we employ +# pre-built images in the optimization. +gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" + +# Connect to benchmarks-prod2 cluster. +gcloud config set project grpc-testing +gcloud container clusters get-credentials benchmarks-prod2 \ + --zone us-central1-b --project grpc-testing + # Clone test-infra repository and build all tools. mkdir ../test-infra pushd ../test-infra diff --git a/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh index 9eb999c7c0c2e..f7424b4d7bc0d 100644 --- a/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh @@ -19,16 +19,6 @@ cd "$(dirname "$0")/../../.." source tools/internal_ci/helper_scripts/prepare_build_linux_rc -# This is to ensure we can push and pull images from Artifact Registry. We do -# not necessarily need it to run load tests, but will need it when we employ -# pre-built images in the optimization. -gcloud auth configure-docker - -# Connect to benchmarks-prod2 cluster. -gcloud config set project grpc-testing -gcloud container clusters get-credentials psm-benchmarks-performance \ - --zone us-central1-b --project grpc-testing - # Set up environment variables. LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}" # BEGIN differentiate experimental configuration from master configuration. @@ -56,6 +46,16 @@ WORKER_POOL_8CORE=workers-c2-8core-ci # Prefix for log URLs in cnsviewer. LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" +# This is to ensure we can push and pull images from Artifact Registry. We do +# not necessarily need it to run load tests, but will need it when we employ +# pre-built images in the optimization. +gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" + +# Connect to benchmarks-prod2 cluster. +gcloud config set project grpc-testing +gcloud container clusters get-credentials psm-benchmarks-performance \ + --zone us-central1-b --project grpc-testing + # Clone test-infra repository and build all tools. pushd .. git clone https://github.com/grpc/test-infra.git