[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 a767ab5d91
PiperOrigin-RevId: 666643972
pull/37544/head
Paulo Castello da Costa 3 months ago committed by Copybara-Service
parent 71c8629e75
commit 564a54b606
  1. 6
      tools/internal_ci/linux/grpc_e2e_performance_gke.sh
  2. 2
      tools/internal_ci/linux/grpc_e2e_performance_gke_cxx_experiments_framework.sh
  3. 6
      tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
  4. 6
      tools/internal_ci/linux/grpc_psm_performance_gke_experiment.sh

@ -34,8 +34,8 @@ GRPC_NODE_GITREF=master
TEST_INFRA_REPO=grpc/test-infra TEST_INFRA_REPO=grpc/test-infra
TEST_INFRA_GITREF=master TEST_INFRA_GITREF=master
# This is to ensure we can push and pull images from gcr.io. We do not # This is to ensure we can push and pull images from Artifact Registry. We do
# necessarily need it to run load tests, but will need it when we employ # not necessarily need it to run load tests, but will need it when we employ
# pre-built images in the optimization. # pre-built images in the optimization.
gcloud auth configure-docker gcloud auth configure-docker
@ -59,7 +59,7 @@ else
fi fi
# END differentiate experimental configuration from master configuration. # END differentiate experimental configuration from master configuration.
CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" 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)" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)"
ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/"
# Head of the workspace checked out by Kokoro. # Head of the workspace checked out by Kokoro.

@ -57,7 +57,7 @@ BIGQUERY_TABLE_8CORE=e2e_benchmark_cxx_experiments.results_8core
BIGQUERY_TABLE_32CORE=e2e_benchmark_cxx_experiments.results_32core BIGQUERY_TABLE_32CORE=e2e_benchmark_cxx_experiments.results_32core
# END differentiate experimental configuration from master configuration. # END differentiate experimental configuration from master configuration.
CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" 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)" UNIQUE_IDENTIFIER="cxx-experiment-$(date +%Y%m%d%H%M%S)"
ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/"
# Head of the workspace checked out by Kokoro. # Head of the workspace checked out by Kokoro.

@ -34,8 +34,8 @@ GRPC_NODE_GITREF=master
TEST_INFRA_REPO=grpc/test-infra TEST_INFRA_REPO=grpc/test-infra
TEST_INFRA_GITREF=master TEST_INFRA_GITREF=master
# This is to ensure we can push and pull images from gcr.io. We do not # This is to ensure we can push and pull images from Artifact Registry. We do
# necessarily need it to run load tests, but will need it when we employ # not necessarily need it to run load tests, but will need it when we employ
# pre-built images in the optimization. # pre-built images in the optimization.
gcloud auth configure-docker gcloud auth configure-docker
@ -54,7 +54,7 @@ BIGQUERY_TABLE_8CORE=e2e_benchmarks.experimental_results
BIGQUERY_TABLE_32CORE=e2e_benchmarks.experimental_results_32core BIGQUERY_TABLE_32CORE=e2e_benchmarks.experimental_results_32core
# END differentiate experimental configuration from master configuration. # END differentiate experimental configuration from master configuration.
CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" 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)" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)"
ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/"
# Head of the workspace checked out by Kokoro. # Head of the workspace checked out by Kokoro.

@ -19,8 +19,8 @@ cd "$(dirname "$0")/../../.."
source tools/internal_ci/helper_scripts/prepare_build_linux_rc 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 # This is to ensure we can push and pull images from Artifact Registry. We do
# necessarily need it to run load tests, but will need it when we employ # not necessarily need it to run load tests, but will need it when we employ
# pre-built images in the optimization. # pre-built images in the optimization.
gcloud auth configure-docker gcloud auth configure-docker
@ -38,7 +38,7 @@ fi
BIGQUERY_TABLE_8CORE=e2e_benchmarks.psm_experimental_results_8core BIGQUERY_TABLE_8CORE=e2e_benchmarks.psm_experimental_results_8core
# END differentiate experimental configuration from master configuration. # END differentiate experimental configuration from master configuration.
CLOUD_LOGGING_URL="https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}" 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)" UNIQUE_IDENTIFIER="$(date +%Y%m%d%H%M%S)"
ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/" ROOT_DIRECTORY_OF_DOCKERFILES="../test-infra/containers/pre_built_workers/"
# Head of the workspace checked out by Kokoro. # Head of the workspace checked out by Kokoro.

Loading…
Cancel
Save