From 564a54b606158ac9126af3ee35167ee241aa24bf Mon Sep 17 00:00:00 2001 From: Paulo Castello da Costa Date: Thu, 22 Aug 2024 22:45:48 -0700 Subject: [PATCH] [benchmark] Move CI images to artifact registry. (#37558) This change moves the location for the prebuilt images used in gRPC OSS benchmarks from GCR to Artifact Registry. Images are all saved to the same repo, instead of being organized by a prefix (`kokoro`, `kokoro-test`, `cxx_experiment/kokoro-test`, etc.). Closes #37558 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37558 from paulosjca:ar a767ab5d9149c1c54fec1c86b0e4bfe7e4bbd3e1 PiperOrigin-RevId: 666643972 --- tools/internal_ci/linux/grpc_e2e_performance_gke.sh | 6 +++--- .../grpc_e2e_performance_gke_cxx_experiments_framework.sh | 2 +- .../linux/grpc_e2e_performance_gke_experiment.sh | 6 +++--- .../linux/grpc_psm_performance_gke_experiment.sh | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh index 6525bd5e54a..31157f5a915 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh @@ -34,8 +34,8 @@ 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 gcr.io. We do not -# necessarily need it to run load tests, but will need it when we employ +# 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 @@ -59,7 +59,7 @@ else fi # END differentiate experimental configuration from master configuration. CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" -PREBUILT_IMAGE_PREFIX="gcr.io/grpc-testing/e2etest/prebuilt/${LOAD_TEST_PREFIX}" +PREBUILT_IMAGE_PREFIX="us-docker.pkg.dev/grpc-testing/e2etest-prebuilt" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" # Head of the workspace checked out by Kokoro. 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 723369b2580..bc23de44e5d 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 @@ -57,7 +57,7 @@ BIGQUERY_TABLE_8CORE=e2e_benchmark_cxx_experiments.results_8core BIGQUERY_TABLE_32CORE=e2e_benchmark_cxx_experiments.results_32core # END differentiate experimental configuration from master configuration. CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" -PREBUILT_IMAGE_PREFIX="gcr.io/grpc-testing/e2etest/prebuilt/cxx_experiment/${LOAD_TEST_PREFIX}" +PREBUILT_IMAGE_PREFIX="us-docker.pkg.dev/grpc-testing/e2etest-prebuilt" UNIQUE_IDENTIFIER="cxx-experiment-$(date +%Y%m%d%H%M%S)" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" # Head of the workspace checked out by Kokoro. 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 f15a716028a..757dbb4a3f1 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh @@ -34,8 +34,8 @@ 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 gcr.io. We do not -# necessarily need it to run load tests, but will need it when we employ +# 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 @@ -54,7 +54,7 @@ BIGQUERY_TABLE_8CORE=e2e_benchmarks.experimental_results BIGQUERY_TABLE_32CORE=e2e_benchmarks.experimental_results_32core # END differentiate experimental configuration from master configuration. CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" -PREBUILT_IMAGE_PREFIX="gcr.io/grpc-testing/e2etest/prebuilt/${LOAD_TEST_PREFIX}" +PREBUILT_IMAGE_PREFIX="us-docker.pkg.dev/grpc-testing/e2etest-prebuilt" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" # Head of the workspace checked out by Kokoro. 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 44a67643838..9eb999c7c0c 100644 --- a/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh @@ -19,8 +19,8 @@ cd "$(dirname "$0")/../../.." source tools/internal_ci/helper_scripts/prepare_build_linux_rc -# 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 +# 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 @@ -38,7 +38,7 @@ fi BIGQUERY_TABLE_8CORE=e2e_benchmarks.psm_experimental_results_8core # END differentiate experimental configuration from master configuration. CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" -PREBUILT_IMAGE_PREFIX="gcr.io/grpc-testing/e2etest/prebuilt/${LOAD_TEST_PREFIX}" +PREBUILT_IMAGE_PREFIX="us-docker.pkg.dev/grpc-testing/e2etest-prebuilt" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" # Head of the workspace checked out by Kokoro.