diff options
| author | Matt Clay <matt@mystile.com> | 2022-02-17 13:05:06 -0800 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2022-02-17 16:18:35 -0800 |
| commit | 79a2ee4beddc87c7a181a75185fcdce604306edc (patch) | |
| tree | d629c13fcd948b664f809c755935a8d2c061ea2a | |
| parent | 5c2251504c7f985fa586c658247f2973950ed732 (diff) | |
| download | ansible-79a2ee4beddc87c7a181a75185fcdce604306edc.tar.gz | |
[stable-2.11] ansible-test - Use quay.io containers in plugins..
(cherry picked from commit c27fd777f4d82fc1eefaa20114cf1f76b7ce1bee)
Co-authored-by: Matt Clay <matt@mystile.com>
| -rw-r--r-- | changelogs/fragments/ansible-test-container-images.yml | 3 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/cloud/galaxy.py | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/cloud/openshift.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changelogs/fragments/ansible-test-container-images.yml b/changelogs/fragments/ansible-test-container-images.yml new file mode 100644 index 0000000000..d5913f5fb3 --- /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/cloud/galaxy.py b/test/lib/ansible_test/_internal/cloud/galaxy.py index c045a362c4..1b34894b8e 100644 --- a/test/lib/ansible_test/_internal/cloud/galaxy.py +++ b/test/lib/ansible_test/_internal/cloud/galaxy.py @@ -100,7 +100,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.containers = [] diff --git a/test/lib/ansible_test/_internal/cloud/openshift.py b/test/lib/ansible_test/_internal/cloud/openshift.py index 450816bf3e..18c414535f 100644 --- a/test/lib/ansible_test/_internal/cloud/openshift.py +++ b/test/lib/ansible_test/_internal/cloud/openshift.py @@ -53,7 +53,7 @@ class OpenShiftCloudProvider(CloudProvider): super(OpenShiftCloudProvider, self).__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.container_name = '' def filter(self, targets, exclude): |