[CI] Migrated interop docker images from GCR to AR (#37413)

Closes #37413

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37413 from veblush:ar-interop 80ec363a9f
PiperOrigin-RevId: 660572538

tools/interop_matrix/README.md

@@ -2,21 +2,24 @@
 
 This directory contains scripts that facilitate building and running gRPC interoperability tests for combinations of language/runtimes (known as matrix).
 
-The setup builds gRPC docker images for each language/runtime and upload it to Google Container Registry (GCR). These images, encapsulating gRPC stack
+The setup builds gRPC docker images for each language/runtime and upload it to Artifact Registry (AR). These images, encapsulating gRPC stack
 from specific releases/tag, are used to test version compatibility between gRPC release versions.
 
-## Step-by-step instructions for adding a GCR image for a new release for compatibility test
-We have continuous nightly test setup to test gRPC backward compatibility between old clients and latest server.  When a gRPC developer creates a new gRPC release, s/he is also responsible to add the just-released gRPC client to the nightly test.  The steps are:
+## Step-by-step instructions for adding a AR docker image for a new release for compatibility test
+
+We have continuous nightly test setup to test gRPC backward compatibility between old clients and latest server.
+When a gRPC developer creates a new gRPC release, s/he is also responsible to add the just-released gRPC client to the nightly test.
+The steps are:
 - Add (or update) an entry in `./client_matrix.py` file to reference the github tag for the release.
 - Build new client docker image(s).  For example, for C and wrapper languages release `v1.9.9`, do
   - `tools/interop_matrix/create_matrix_images.py --git_checkout --release=v1.9.9 --upload_images --language cxx python ruby php`
-- Verify that the new docker image was built successfully and uploaded to GCR.  For example,
-  - `gcloud container images list --repository gcr.io/grpc-testing` lists available images.
-  - `gcloud container images list-tags gcr.io/grpc-testing/grpc_interop_java` should show an image entry with tag `v1.9.9`.
-  - images can also be viewed in https://pantheon.corp.google.com/gcr/images/grpc-testing?project=grpc-testing
+- Verify that the new docker image was built successfully and uploaded to AR.  For example,
+  - `gcloud artifacts docker images list us-docker.pkg.dev/grpc-testing/testing-images-public` lists available images.
+  - `gcloud artifacts docker images list us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_java --include-tags` should show an image entry with tag `v1.9.9`.
+  - images can also be viewed in https://pantheon.corp.google.com/artifacts/docker/grpc-testing/us/testing-images-public
 - Verify the just-created docker client image would pass backward compatibility test (it should).  For example,
-  - `gcloud docker -- pull gcr.io/grpc-testing/grpc_interop_java:v1.9.9` followed by
-  - `docker_image=gcr.io/grpc-testing/grpc_interop_java:v1.9.9 tools/interop_matrix/testcases/java__master`
+  - `docker pull us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_java:v1.9.9` followed by
+  - `docker_image=us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_java:v1.9.9 tools/interop_matrix/testcases/java__master`
 - Commit the change and create a PR to upstream/master.
 - Trigger an adhoc run of interop matrix tests: https://fusion.corp.google.com/projectanalysis/summary/KOKORO/prod:grpc%2Fcore%2Fexperimental%2Flinux%2Fgrpc_interop_matrix_adhoc
 - Once tests pass, request a PR review.
@@ -24,30 +27,34 @@ We have continuous nightly test setup to test gRPC backward compatibility betwee
 For more details on each step, refer to sections below.
 
 ## Instructions for adding new language/runtimes
+
 - Create new `Dockerfile.template`, `build_interop.sh.template` for the language/runtime under `template/tools/dockerfile/`.
 - Run `tools/buildgen/generate_projects.sh` to create corresponding files under `tools/dockerfile/`.
 - Add language/runtimes to `client_matrix.py` following existing language/runtimes examples.
-- Run `tools/interop_matrix/create_matrix_images.py` which will build (and upload) images to GCR.
+- Run `tools/interop_matrix/create_matrix_images.py` which will build (and upload) images to AR.
 
 ## Instructions for creating new test cases
+
 - Create test cases by running `LANG=<lang> [RELEASE=<release>] ./create_testcases.sh`.  For example,
   - `LANG=go ./create_testcases.sh` will generate `./testcases/go__master`, which is also a functional bash script.
   - `LANG=go KEEP_IMAGE=1 ./create_testcases.sh` will generate `./testcases/go__master` and keep the local docker image so it can be invoked simply via `./testcases/go__master`.  Note: remove local docker images manually afterwards with `docker rmi <image_id>`.
 - Stage and commit the generated test case file `./testcases/<lang>__<release>`.
 
-## Instructions for running test cases against GCR images
+## Instructions for running test cases against AR docker images
+
 - Run `tools/interop_matrix/run_interop_matrix_tests.py`.  Useful options:
-  - `--release` specifies a git release tag.  Defaults to `--release=all`.  Make sure the GCR images with the tag have been created using `create_matrix_images.py` above.
+  - `--release` specifies a git release tag.  Defaults to `--release=all`.  Make sure the AR images with the tag have been created using `create_matrix_images.py` above.
   - `--language` specifies a language.  Defaults to `--language=all`.
   For example, To test all languages for all gRPC releases across all runtimes, do `tools/interop_matrix/run_interop_matrix_test.py --release=all`.
 - The output for all the test cases is recorded in a junit style xml file (defaults to 'report.xml').
 
-## Instructions for running test cases against a GCR image manually
-- Download docker image from GCR.  For example: `gcloud docker -- pull gcr.io/grpc-testing/grpc_interop_go1.8:v1.16.0`.
+## Instructions for running test cases against an AR image manually
+
+- Download a docker image from AR.  For example: `docker pull us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.8:v1.16.0`.
 - Run test cases by specifying `docker_image` variable inline with the test case script created above.
 For example:
-  - `docker_image=gcr.io/grpc-testing/grpc_interop_go1.8:v1.16.0 ./testcases/go__master` will run go__master test cases against `go1.8` with gRPC release `v1.16.0` docker image in GCR.
+  - `docker_image=us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.8:v1.16.0 ./testcases/go__master` will run go__master test cases against `go1.8` with gRPC release `v1.16.0` docker image in AR.
 
 Note:
 - File path starting with `tools/` or `template/` are relative to the grpc repo root dir.  File path starting with `./` are relative to current directory (`tools/interop_matrix`).
-- Creating and referencing images in GCR require read and write permission to Google Container Registry path gcr.io/grpc-testing.
+- Creating and referencing images in AR require read and write permission to AR path us-docker.pkg.dev/grpc-testing.

tools/interop_matrix/create_matrix_images.py

@@ -53,9 +53,9 @@ _BUILD_INFO = "/var/local/build_info"
 
 argp = argparse.ArgumentParser(description="Run interop tests.")
 argp.add_argument(
-    "--gcr_path",
-    default="gcr.io/grpc-testing",
-    help="Path of docker images in Google Container Registry",
+    "--docker_path",
+    default="us-docker.pkg.dev/grpc-testing/testing-images-public",
+    help="Path of docker images",
 )
 
 argp.add_argument(
@@ -175,7 +175,7 @@ def build_image_jobspec(runtime, env, gcr_tag, stack_base):
     stack_base: the local gRPC repo path.
     """
     basename = "grpc_interop_%s" % runtime
-    tag = "%s/%s:%s" % (args.gcr_path, basename, gcr_tag)
+    tag = "%s/%s:%s" % (args.docker_path, basename, gcr_tag)
     build_env = {"INTEROP_IMAGE": tag, "BASE_NAME": basename}
     build_env.update(env)
     image_builder_path = _IMAGE_BUILDER
@@ -407,8 +407,8 @@ for lang in languages:
     for image in docker_images:
         if args.upload_images:
             jobset.message("START", "Uploading %s" % image, do_newline=True)
-            # docker image name must be in the format <gcr_path>/<image>:<gcr_tag>
-            assert image.startswith(args.gcr_path) and image.find(":") != -1
+            # docker image name must be in the format <docker_path>/<image>:<gcr_tag>
+            assert image.startswith(args.docker_path) and image.find(":") != -1
             # Add a tag to exclude the image from the GCP Vulnerability Scanner.
             (image_name, tag_name) = image.rsplit(":", 1)
             alternate_image = (

tools/interop_matrix/run_interop_matrix_tests.py

@@ -56,9 +56,9 @@ _RELEASES = sorted(
 argp = argparse.ArgumentParser(description="Run interop tests.")
 argp.add_argument("-j", "--jobs", default=multiprocessing.cpu_count(), type=int)
 argp.add_argument(
-    "--gcr_path",
-    default="gcr.io/grpc-testing",
-    help="Path of docker images in Google Container Registry",
+    "--docker_path",
+    default="us-docker.pkg.dev/grpc-testing/testing-images-public",
+    help="Path of docker images",
 )
 argp.add_argument(
     "--release",
@@ -348,7 +348,9 @@ languages = args.language if args.language != ["all"] else _LANGUAGES
 total_num_failures = 0
 _xml_report_tree = report_utils.new_junit_xml_tree()
 for lang in languages:
-    docker_images = _get_test_images_for_lang(lang, args.release, args.gcr_path)
+    docker_images = _get_test_images_for_lang(
+        lang, args.release, args.docker_path
+    )
     for runtime in sorted(docker_images.keys()):
         total_num_failures += _run_tests_for_lang(
             lang, runtime, docker_images[runtime], _xml_report_tree