[stable-2.12] ansible-test - Use quay.io containers in plugins.

(cherry picked from commit c27fd777f4)

Co-authored-by: Matt Clay <matt@mystile.com>
pull/77084/head
Matt Clay 4 years ago
parent 782b8645b8
commit 582d3b1488

@ -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.

@ -86,7 +86,7 @@ class GalaxyProvider(CloudProvider):
# the newer update is available. # the newer update is available.
self.pulp = os.environ.get( self.pulp = os.environ.get(
'ANSIBLE_PULP_CONTAINER', 'ANSIBLE_PULP_CONTAINER',
'docker.io/pulp/pulp-galaxy-ng@sha256:b79a7be64eff86d8f58db9ca83ed4967bd8b4e45c99addb17a91d11926480cf1' 'quay.io/ansible/pulp-galaxy-ng:b79a7be64eff'
) )
self.uses_docker = True self.uses_docker = True

@ -36,7 +36,7 @@ class OpenShiftCloudProvider(CloudProvider):
super().__init__(args, config_extension='.kubeconfig') super().__init__(args, config_extension='.kubeconfig')
# The image must be pinned to a specific version to guarantee CI passes with the version used. # 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_docker = True
self.uses_config = True self.uses_config = True

Loading…
Cancel
Save