From 42924fca9fe41fcf56312ed9e5f1dee953fbd589 Mon Sep 17 00:00:00 2001 From: Paulo Castello da Costa Date: Wed, 28 Aug 2024 20:26:05 -0700 Subject: [PATCH] [benchmark] Support GCR and Artifact Registry. We have base images that still need to be migrated (for instance, from marketplace.gcr.io). This change restores support for GCR, to be maintained until all images are migrated. --- tools/internal_ci/linux/grpc_e2e_performance_gke.sh | 7 ++++--- .../grpc_e2e_performance_gke_cxx_experiments_framework.sh | 7 ++++--- .../linux/grpc_e2e_performance_gke_experiment.sh | 7 ++++--- .../linux/grpc_psm_performance_gke_experiment.sh | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh index 744d7e10cef0e2..fedbea3839f8c8 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh @@ -73,9 +73,10 @@ 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. +# This is to ensure we can push and pull images from GCR and 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 gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" # Connect to benchmarks-prod2 cluster. 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 7656e516205cf9..35567f842b645d 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 @@ -67,9 +67,10 @@ 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. +# This is to ensure we can push and pull images from GCR and 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 gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" # Connect to benchmarks-prod2 cluster. 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 e56ca30b37c650..868a68827f6d5a 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh @@ -68,9 +68,10 @@ 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. +# This is to ensure we can push and pull images from GCR and 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 gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" # Connect to benchmarks-prod2 cluster. 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 f7424b4d7bc0d9..3dea89b24f6fc4 100644 --- a/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh @@ -46,9 +46,10 @@ 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. +# This is to ensure we can push and pull images from GCR and 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 gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" # Connect to benchmarks-prod2 cluster.