[benchmark] Support GCR and Artifact Registry. (#37596)

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.

Closes #37596

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37596 from paulosjca:ar 9c4c91b9bb
PiperOrigin-RevId: 669396634
pull/37615/head
Paulo Castello da Costa 3 months ago committed by Copybara-Service
parent c4117e4615
commit f34b4faca4
  1. 9
      tools/internal_ci/linux/grpc_e2e_performance_gke.sh
  2. 9
      tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh
  3. 9
      tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
  4. 9
      tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh

@ -73,10 +73,11 @@ WORKER_POOL_32CORE=workers-c2-30core-ci
# Prefix for log URLs in cnsviewer. # Prefix for log URLs in cnsviewer.
LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" 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 # This is to ensure we can push and pull images from GCR and Artifact Registry.
# not necessarily need it to run load tests, but will need it when we employ # We do not necessarily need it to run load tests, but will need it when we
# pre-built images in the optimization. # employ pre-built images in the optimization.
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" gcloud auth configure-docker --quiet
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" --quiet
# Connect to benchmarks-prod2 cluster. # Connect to benchmarks-prod2 cluster.
gcloud config set project grpc-testing gcloud config set project grpc-testing

@ -67,10 +67,11 @@ WORKER_POOL_32CORE=workers-c2-30core-ci
# Prefix for log URLs in cnsviewer. # Prefix for log URLs in cnsviewer.
LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" 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 # This is to ensure we can push and pull images from GCR and Artifact Registry.
# not necessarily need it to run load tests, but will need it when we employ # We do not necessarily need it to run load tests, but will need it when we
# pre-built images in the optimization. # employ pre-built images in the optimization.
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" gcloud auth configure-docker --quiet
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" --quiet
# Connect to benchmarks-prod2 cluster. # Connect to benchmarks-prod2 cluster.
gcloud config set project grpc-testing gcloud config set project grpc-testing

@ -68,10 +68,11 @@ WORKER_POOL_32CORE=workers-c2-30core-ci
# Prefix for log URLs in cnsviewer. # Prefix for log URLs in cnsviewer.
LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" 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 # This is to ensure we can push and pull images from GCR and Artifact Registry.
# not necessarily need it to run load tests, but will need it when we employ # We do not necessarily need it to run load tests, but will need it when we
# pre-built images in the optimization. # employ pre-built images in the optimization.
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" gcloud auth configure-docker --quiet
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" --quiet
# Connect to benchmarks-prod2 cluster. # Connect to benchmarks-prod2 cluster.
gcloud config set project grpc-testing gcloud config set project grpc-testing

@ -46,10 +46,11 @@ WORKER_POOL_8CORE=workers-c2-8core-ci
# Prefix for log URLs in cnsviewer. # Prefix for log URLs in cnsviewer.
LOG_URL_PREFIX="http://cnsviewer/placer/prod/home/kokoro-dedicated/build_artifacts/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/github/grpc/" 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 # This is to ensure we can push and pull images from GCR and Artifact Registry.
# not necessarily need it to run load tests, but will need it when we employ # We do not necessarily need it to run load tests, but will need it when we
# pre-built images in the optimization. # employ pre-built images in the optimization.
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" gcloud auth configure-docker --quiet
gcloud auth configure-docker "${PREBUILT_IMAGE_PREFIX%%/*}" --quiet
# Connect to benchmarks-prod2 cluster. # Connect to benchmarks-prod2 cluster.
gcloud config set project grpc-testing gcloud config set project grpc-testing

Loading…
Cancel
Save