Revert "recipes: Use chops-public-images-prod" This reverts commit e78a9789f01c6fd24defee525cbe569d3610ae4e. Reason for revert: http://b/476036083#comment5 Original change's description: > recipes: Use chops-public-images-prod > > This replaces chromium-container-registry with chops-public-images-prod. > > This may cause some permission error on bots, but I'll fix IAM when that > happen as we don't know which accounts use this script. > > Bug: 461358834 > Change-Id: I7ca97ccd0ac09cd21f78fa1d308e6c8f07173332 > Reviewed-on: https://chromium-review.googlesource.com/c/infra/infra/+/7401593 > Reviewed-by: Ben Pastene <bpastene@chromium.org> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Cr-Commit-Position: refs/heads/main@{#78320} Bug: 461358834, 476036083 Change-Id: Ia5e18b5788e05aa82f9fe27d2ef476f6bf397a5c Reviewed-on: https://chromium-review.googlesource.com/c/infra/infra/+/7488630 Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/main@{#78442}
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 0ff25ef..741d9e3 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md
@@ -531,7 +531,7 @@ Returns Docker version installed or None if failed to detect. -— **def [login](/recipes/recipe_modules/docker/api.py#51)(self, server='gcr.io', project='chops-public-images-prod', service_account=None, step_name=None, \*\*kwargs):** +— **def [login](/recipes/recipe_modules/docker/api.py#51)(self, server='gcr.io', project='chromium-container-registry', service_account=None, step_name=None, \*\*kwargs):** Connect to a Docker registry.
diff --git a/recipes/recipe_modules/docker/api.py b/recipes/recipe_modules/docker/api.py index d960c99..9836229 100644 --- a/recipes/recipe_modules/docker/api.py +++ b/recipes/recipe_modules/docker/api.py
@@ -50,7 +50,7 @@ def login(self, server='gcr.io', - project='chops-public-images-prod', + project='chromium-container-registry', service_account=None, step_name=None, **kwargs):
diff --git a/recipes/recipe_modules/docker/examples/full.expected/example.json b/recipes/recipe_modules/docker/examples/full.expected/example.json index 99a82f1..d133840 100644 --- a/recipes/recipe_modules/docker/examples/full.expected/example.json +++ b/recipes/recipe_modules/docker/examples/full.expected/example.json
@@ -55,7 +55,7 @@ "--config", "[CLEANUP]/.docker", "pull", - "gcr.io/chops-public-images-prod/testimage" + "gcr.io/chromium-container-registry/testimage" ], "name": "docker pull testimage" }, @@ -67,7 +67,7 @@ "--config-file", "[CLEANUP]/.docker", "--image", - "gcr.io/chops-public-images-prod/testimage", + "gcr.io/chromium-container-registry/testimage", "--dir-map", "/foo", "/bar", @@ -88,7 +88,7 @@ "--config", "[CLEANUP]/.docker", "push", - "gcr.io/chops-public-images-prod/image:2018-11-16-01-25" + "gcr.io/chromium-container-registry/image:2018-11-16-01-25" ], "name": "docker push" },
diff --git a/recipes/recipe_modules/docker/examples/full.py b/recipes/recipe_modules/docker/examples/full.py index 3cc0fc4..b781941 100644 --- a/recipes/recipe_modules/docker/examples/full.py +++ b/recipes/recipe_modules/docker/examples/full.py
@@ -31,7 +31,8 @@ }, inherit_luci_context=True, ) - api.docker('push', 'gcr.io/chops-public-images-prod/image:2018-11-16-01-25') + api.docker('push', + 'gcr.io/chromium-container-registry/image:2018-11-16-01-25') def GenTests(api):