From 582d3b1488ad0d88100324b385a1a07c34637dfc Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 17 Feb 2022 13:05:06 -0800 Subject: [PATCH] [stable-2.12] ansible-test - Use quay.io containers in plugins. (cherry picked from commit c27fd777f4d82fc1eefaa20114cf1f76b7ce1bee) Co-authored-by: Matt Clay --- changelogs/fragments/ansible-test-container-images.yml | 3 +++ .../_internal/commands/integration/cloud/galaxy.py | 2 +- .../_internal/commands/integration/cloud/openshift.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ansible-test-container-images.yml diff --git a/changelogs/fragments/ansible-test-container-images.yml b/changelogs/fragments/ansible-test-container-images.yml new file mode 100644 index 00000000000..d5913f5fb34 --- /dev/null +++ b/changelogs/fragments/ansible-test-container-images.yml @@ -0,0 +1,3 @@ +minor_changes: + - ansible-test - Update the ``galaxy`` test plugin to get its container from a copy on quay.io. + - ansible-test - Update the ``openshift`` test plugin to get its container from a copy on quay.io. diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py b/test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py index 9c9000715d8..de58cbf5bca 100644 --- a/test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py @@ -86,7 +86,7 @@ class GalaxyProvider(CloudProvider): # the newer update is available. self.pulp = os.environ.get( 'ANSIBLE_PULP_CONTAINER', - 'docker.io/pulp/pulp-galaxy-ng@sha256:b79a7be64eff86d8f58db9ca83ed4967bd8b4e45c99addb17a91d11926480cf1' + 'quay.io/ansible/pulp-galaxy-ng:b79a7be64eff' ) self.uses_docker = True diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py b/test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py index c30785afafb..10f63ac05aa 100644 --- a/test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py @@ -36,7 +36,7 @@ class OpenShiftCloudProvider(CloudProvider): super().__init__(args, config_extension='.kubeconfig') # The image must be pinned to a specific version to guarantee CI passes with the version used. - self.image = 'openshift/origin:v3.9.0' + self.image = 'quay.io/ansible/openshift-origin:v3.9.0' self.uses_docker = True self.uses_config = True