tests: use quay.io instead of quay.ceph.io

This makes the CI use quay.io instead of quay.ceph.io

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e55ca0188190173320ca77c62d2a908e9e8f5c61)

diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst
index b1115357295fe032fb526b7f559d327a0611dcbe..3333bbdd57b0d8419d1b913da85a01c9d82dbc82 100644 (file)
--- a/docs/source/installation/containerized.rst
+++ b/docs/source/installation/containerized.rst
@@ -29,8 +29,8 @@ You can configure your own container register, image and tag by using the ``ceph
 
 .. code-block:: yaml
 
-   ceph_docker_registry: quay.ceph.io
-   ceph_docker_image: ceph-ci/daemon
+   ceph_docker_registry: quay.io
+   ceph_docker_image: ceph/daemon
    ceph_docker_image_tag: latest
 
 .. note::

diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst
index ae845d2bbd640f512cf21e12fbb4c63b5922be60..e2c3a3286d702b33e8a7beb3eeee9069c67c277c 100644 (file)
--- a/docs/source/testing/tox.rst
+++ b/docs/source/testing/tox.rst
@@ -21,9 +21,9 @@ runs of ``ceph-ansible``.
 
 The following environent variables are available for use:
 
-* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
+* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
 
-* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
+* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
 
 * ``CEPH_DOCKER_IMAGE_TAG``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image_name``.
 

diff --git a/library/cephadm_adopt.py b/library/cephadm_adopt.py
index d9472745c956dd3cc48fdb3f4d76d77b32104bf0..723e0a46ce03b4b9b170b250bb70038ba67f53cb 100644 (file)
--- a/library/cephadm_adopt.py
+++ b/library/cephadm_adopt.py
@@ -84,7 +84,7 @@ EXAMPLES = '''
   cephadm_adopt:
     name: mon.foo
     style: legacy
-    image: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    image: quay.io/ceph/daemon-base:latest-main-devel
     pull: false
     firewalld: false
 
@@ -93,7 +93,7 @@ EXAMPLES = '''
     name: mon.foo
     style: legacy
   environment:
-    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
 '''
 
 RETURN = '''#  '''

diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py
index a1b7ebfcf64d60880cd8dcf6591cf1a85da079f6..f7d2cbdca5e87513a29f31835b4359884d9a78d4 100644 (file)
--- a/library/cephadm_bootstrap.py
+++ b/library/cephadm_bootstrap.py
@@ -124,7 +124,7 @@ EXAMPLES = '''
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
     fsid: 3c9ba63a-c7df-4476-a1e7-317dfc711f82
-    image: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    image: quay.io/ceph/daemon-base:latest-main-devel
     dashboard: false
     monitoring: false
     firewalld: false
@@ -133,7 +133,7 @@ EXAMPLES = '''
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
   environment:
-    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
 '''
 
 RETURN = '''#  '''

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index f432814de5effd1859a80284294f7988c184c707..10cdfb97534d8c865968fc258d68214bf266ffea 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 4fda70e55e1318e5417f735152f868100f64f15f..e087ba14d5e44cafc333d38f12eceb199b85dfd5 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index c485ae995c111f5f60c4d5cccf2ccf551b0ef462..62a5ac64270f6e3ae82b6825580742c42365c273 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 117af232509d19573488b45f17e5519f391f009f..f29f17ffc94d341d0dcd6b606e3aad9502a279e2 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index 9588c02496a1a3e588b343fd003f16321e6b0f34..0ec673c53468eb2d1f4e0b09045205212f9f2019 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index c90184973e3bd4b69a4242b3e32afd762a6e3fb6..4880c9c962e4771b63e5fa710b8a96d596e5900e 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -29,6 +29,6 @@ ceph_conf_overrides:
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index 6d3cea8e565e922bc56d0ba15c46f59f43fda18d..dde781eeeef2be402e90f55deaf5d4c95bd1a3fa 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -43,6 +43,6 @@ lvm_volumes:
     data_vg: test_group
     db: journal1
     db_vg: journals
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 97226467ba86ab6d3825e2c8c28f6948519f8419..f9f93c9df10653061eb2e27a4e3d550e932a9a4f 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -35,10 +35,10 @@ handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 69e021238e7865585e8b6bc432b15d1c4f00b951..a83109563b073887e367dc01ef4d57e2c57194c3 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -29,9 +29,9 @@ handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+ceph_docker_registry: quay.io
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
 grafana_server_group_name: ceph_monitoring

diff --git a/tests/functional/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all
index 1e7f964315245e2fcb82e965f5ea0b9b3c7f74ae..279185a3d34bece59c5c600414bb4ddf1a28b0f8 100644 (file)
--- a/tests/functional/cephadm/group_vars/all
+++ b/tests/functional/cephadm/group_vars/all
@@ -3,7 +3,7 @@ monitor_interface: eth1
 public_network: "192.168.30.0/24"
 cluster_network: "192.168.31.0/24"
 dashboard_admin_password: $sX!cD$rYU6qR^B!
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon-base
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-pacific-devel
 containerized_deployment: true

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index 88777e0cdfc5d70d5257e2d35d2661f2fe94165b..05ddc8901acde56c54a0523fb9c051f613e149e6 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -24,10 +24,10 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 1b4f7b810bced82ebd5ea2e42cb36cff231abc7d..7de2aa4b478be668accc23685e2a7e898091b309 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -21,8 +21,8 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
\ No newline at end of file
+ceph_docker_registry: quay.io
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
\ No newline at end of file

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 0842f5c93f75d726dc03bcf5be971a6822cf40c9..90eb185ec00b04be4fe42065d74fba1f5f55e0b2 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -33,10 +33,10 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index db6db14ad8de3878165413470dfa02b0326d80b2..507f6685c010438942d7f5faf08ddac6158741b4 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -37,6 +37,6 @@ lvm_volumes:
     db_vg: journals
 fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
 generate_fsid: false
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all
index c8449a2fa8106998a412aa690f78dbca5a9eadf3..21be9dc3e0c628bfbf5fc6644177a54c086177d9 100644 (file)
--- a/tests/functional/filestore-to-bluestore/container/group_vars/all
+++ b/tests/functional/filestore-to-bluestore/container/group_vars/all
@@ -23,6 +23,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 8889fd730e7be1663b34adf68c02b97413abe112..fe537ce04dbf8068fe7ae742a4313f76d474d5c3 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index fb1df01f73bfd9ccd9d670143652cca6000eb9de..2644410328b4ab7b79fdb7cbec6d0e722067ce9c 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -29,6 +29,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 2941255dab1b2af5d356da7bd5cef2acc54fe945..518653b8bf8b5e8299372ee58f9f76b5be61e586 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -37,6 +37,6 @@ openstack_cinder_pool:
 openstack_pools:
   - "{{ openstack_glance_pool }}"
   - "{{ openstack_cinder_pool }}"
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts
index e5afe0cc99761526f8b0400f33b4c749d1bd0631..65aad634c1573fdc860c4d76c09b388cc47900ae 100644 (file)
--- a/tests/functional/ooo-collocation/hosts
+++ b/tests/functional/ooo-collocation/hosts
@@ -10,9 +10,9 @@ all:
         rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true',
         rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0}
     cluster: mycluster
-    ceph_docker_image: ceph-ci/daemon
+    ceph_docker_image: ceph/daemon
     ceph_docker_image_tag: latest-pacific
-    ceph_docker_registry: quay.ceph.io
+    ceph_docker_registry: quay.io
     cephfs_data_pool:
       name: 'manila_data'
       application: "cephfs"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 69df01172e3b7502e1f5734bf3547a5924efc76b..ce0e8eed2c8c5a3b5c3a0df4bfb44ac95eebd8d7 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -32,10 +32,10 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all
index 71de37c52b3679ef169d81a63251058c50de8b80..8427b3dc56f7606674d604fa56db5c7d02d2354c 100644 (file)
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-main
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index 93d4ad0f8f49f2ab8b8449f81de71bb094821a72..195a48333a2365b7ee6add52a7ba8c09c8e21e4c 100644 (file)
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-main
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 0d46237ed6da0209910d031cf8651c9f3d2a0596..e1e8b1b00c63710cb61bfd8e578c2bf5cdc682eb 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -28,6 +28,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index be2165e135a0ccd5fe8c0659fb54b3e819ecc5d9..bd54d707895a00221d83af4d13dade7c60d7f72d 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -28,6 +28,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index bdad444b57d1dea427c1be9e20bfe1aa1c71cbdc..0becd271086188325fd7dcfb1a1e44b64c2a2a8e 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -16,6 +16,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 486c8a8c16881f747d3c6f4a97c1b13d85b94949..969f20f6b69bfadf4c262451a84dfd1d28d69b05 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -15,6 +15,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index a04dd8cb30a600afbe99fec5ec407c34c097bf95..5e5603140dff9dbc40ea1b0ac2bbd73c943062a9 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -15,6 +15,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 27c6e44d4a1ec9dc82e33cce7bcb9cfd9d0778b5..5697ef25b6a9ab73dbdc5b3574edee95b9be8bec 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -16,6 +16,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 0817ccb048e05d018d83e5206d9e85a6cef1d9ac..fdb314e7ab88e7ca037ccbf764bba4187f8eab06 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -15,6 +15,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index d397e7e11eaba0126959f4a7ed26e36da07f4220..403b93d6ae5dd543ff2b03c1f15dfa4e3cc5d936 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -17,6 +17,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-pacific
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index 059267a4b46d33506c6a0eb991031d7969926597..2bbb3ebdcf6c07a1aa4bb9454afa9cc5b17202d4 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -27,10 +27,10 @@ mds_max_mds: 2
 dashboard_enabled: false
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-pacific
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all
index a107e33d25b39c6f4f5618a164457bae5fbf3141..13725dd32cbd21871be24f62f1ae3c62595ab2f0 100644 (file)
--- a/tests/functional/subset_update/group_vars/all
+++ b/tests/functional/subset_update/group_vars/all
@@ -19,9 +19,9 @@ mds_max_mds: 2
 dashboard_enabled: false
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+ceph_docker_registry: quay.io
+node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
 grafana_server_group_name: ceph_monitoring

diff --git a/tests/library/test_ceph_crush_rule.py b/tests/library/test_ceph_crush_rule.py
index 68e0c97e1d0c69865284238d67124bbc48b2fc87..e3bd9b173f21b0d05eaaaf92e7f31784f2ce04c7 100644 (file)
--- a/tests/library/test_ceph_crush_rule.py
+++ b/tests/library/test_ceph_crush_rule.py
@@ -6,7 +6,7 @@ import ceph_crush_rule
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_name = 'foo'
 fake_bucket_root = 'default'
 fake_bucket_type = 'host'

diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py
index bbeeecbc9b2e078d32725ec43ead31754d0cba8f..7f52f245ce9ed1aede8f81fd737f6a5860aabbbd 100644 (file)
--- a/tests/library/test_ceph_key.py
+++ b/tests/library/test_ceph_key.py
@@ -70,8 +70,8 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_args = ['arg']
         fake_user = "fake-user"
-        fake_key = "/tmp/my-key"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_user_key = "/tmp/my-key"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = ['docker',
                                  'run',
                                  '--rm',
@@ -80,7 +80,7 @@ class TestCephKeyModule(object):
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                 'quay.io/ceph/daemon:latest-luminous',
                                  '-n',
                                  "fake-user",
                                  '-k',
@@ -90,7 +90,7 @@ class TestCephKeyModule(object):
                                  'auth',
                                  'arg']
         result = ceph_key.generate_ceph_cmd(
-            fake_cluster, fake_args, fake_user, fake_key, fake_container_image)
+            fake_cluster, fake_args, fake_user, fake_user_key, fake_container_image)
         assert result == expected_command_list
 
     def test_generate_ceph_authtool_cmd_non_container_no_auid(self):
@@ -134,7 +134,7 @@ class TestCephKeyModule(object):
         fake_dest = "/fake/ceph"
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = ['docker',
                                  'run',
                                  '--rm',
@@ -143,7 +143,7 @@ class TestCephKeyModule(object):
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-authtool',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                 'quay.io/ceph/daemon:latest-luminous',
                                  '--create-keyring',
                                  fake_file_destination,
                                  '--name',
@@ -202,7 +202,7 @@ class TestCephKeyModule(object):
         fake_import_key = True
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [
             ['docker',
              'run',
@@ -212,7 +212,7 @@ class TestCephKeyModule(object):
              '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
              '-v', '/var/log/ceph/:/var/log/ceph/:z',
              '--entrypoint=ceph-authtool',
-             'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+             'quay.io/ceph/daemon:latest-luminous',
              '--create-keyring', fake_file_destination,
              '--name', fake_name,
              '--add-key', fake_secret,
@@ -226,7 +226,7 @@ class TestCephKeyModule(object):
              '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
              '-v', '/var/log/ceph/:/var/log/ceph/:z',
              '--entrypoint=ceph',
-             'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+             'quay.io/ceph/daemon:latest-luminous',
              '-n', 'client.admin',
              '-k', '/etc/ceph/fake.client.admin.keyring',
              '--cluster', fake_cluster,
@@ -289,7 +289,7 @@ class TestCephKeyModule(object):
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         # create_key passes (one for ceph-authtool and one for itself) itw own array so the expected result is an array within an array # noqa E501
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [['docker',   # noqa E128
                                   'run',
                                   '--rm',
@@ -298,7 +298,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph-authtool',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '--create-keyring',
                                   fake_file_destination,
                                   '--name',
@@ -332,7 +332,7 @@ class TestCephKeyModule(object):
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
         fake_cluster = "fake"
         fake_name = "client.fake"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -341,7 +341,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '-n', 'client.admin',
                                   '-k', '/etc/ceph/fake.client.admin.keyring',
                                   '--cluster', fake_cluster,
@@ -371,7 +371,7 @@ class TestCephKeyModule(object):
         fake_name = "client.fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [['docker',   # noqa E128
                                   'run',
                                   '--rm',
@@ -380,7 +380,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '-n', fake_user,
                                   '-k', fake_user_key,
                                   '--cluster', fake_cluster,
@@ -406,7 +406,7 @@ class TestCephKeyModule(object):
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
         fake_name = "client.fake"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         fake_dest = "/fake/ceph"
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
@@ -418,7 +418,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '-n', fake_user,
                                   '-k', fake_user_key,
                                   '--cluster', fake_cluster,
@@ -463,7 +463,7 @@ class TestCephKeyModule(object):
         fake_user = "mon."
         fake_keyring_dirname = fake_cluster + "-" + fake_hostname
         fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring')
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -472,7 +472,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '-n', "mon.",
                                   '-k', "/var/lib/ceph/mon/fake-mon01/keyring",
                                   '--cluster', fake_cluster,
@@ -485,7 +485,7 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_user = "fake-user"
         fake_key = "/tmp/my-key"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
+        fake_container_image = "quay.io/ceph/daemon:latest-luminous"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -494,7 +494,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-luminous',
+                                  'quay.io/ceph/daemon:latest-luminous',
                                   '-n', "fake-user",
                                   '-k', "/tmp/my-key",
                                   '--cluster', fake_cluster,

diff --git a/tests/library/test_ceph_mgr_module.py b/tests/library/test_ceph_mgr_module.py
index efd87bf085319f4e199238f5513511491bfad0ce..d426a95033826f2e5ccda7f117b78aff8c9481a2 100644 (file)
--- a/tests/library/test_ceph_mgr_module.py
+++ b/tests/library/test_ceph_mgr_module.py
@@ -6,7 +6,7 @@ import ceph_mgr_module
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_module = 'noup'
 fake_user = 'client.admin'
 fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)

diff --git a/tests/library/test_ceph_osd.py b/tests/library/test_ceph_osd.py
index dc5c6ab5104c69934a1834b3e3ae575940d2374e..6d1f3141b41daada7e6905ca1e53a982c7bbcc4e 100644 (file)
--- a/tests/library/test_ceph_osd.py
+++ b/tests/library/test_ceph_osd.py
@@ -6,7 +6,7 @@ import ceph_osd
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_id = '42'
 fake_ids = ['0', '7', '13']
 fake_user = 'client.admin'

diff --git a/tests/library/test_ceph_osd_flag.py b/tests/library/test_ceph_osd_flag.py
index 5f99f1e2f7778dad9c5d5f2646e62b213d7b7b2d..bbc865eef95ed4a79ced28dd58b55963fb9795d0 100644 (file)
--- a/tests/library/test_ceph_osd_flag.py
+++ b/tests/library/test_ceph_osd_flag.py
@@ -6,7 +6,7 @@ import ceph_osd_flag
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_flag = 'noup'
 fake_user = 'client.admin'
 fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)

diff --git a/tests/library/test_ceph_pool.py b/tests/library/test_ceph_pool.py
index c9e831c0816b9a758925fd537f08f8fdcf806f68..2ce40560fc5235511b4bf633340ceebce055e7e2 100644 (file)
--- a/tests/library/test_ceph_pool.py
+++ b/tests/library/test_ceph_pool.py
@@ -8,7 +8,7 @@ fake_user = 'client.admin'
 fake_user_key = '/etc/ceph/ceph.client.admin.keyring'
 fake_pool_name = 'foo'
 fake_cluster_name = 'ceph'
-fake_container_image_name = 'quay.ceph.io/ceph-ci/daemon:latest-luminous'
+fake_container_image_name = 'quay.io/ceph/daemon:latest-luminous'
 
 
 @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': 'podman'})

diff --git a/tests/library/test_ceph_volume.py b/tests/library/test_ceph_volume.py
index bfcb28c43f239cd78ed28f227dab4f225b69a94e..02dbb36422d382a426d6139e0eb5119b8cef8ce4 100644 (file)
--- a/tests/library/test_ceph_volume.py
+++ b/tests/library/test_ceph_volume.py
@@ -76,7 +76,7 @@ class TestCephVolumeModule(object):
 
     def test_container_exec(self):
         fake_binary = "ceph-volume"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + [fake_container_image]
         result = ceph_volume.container_exec(fake_binary, fake_container_image)
         assert result == expected_command_list
@@ -84,7 +84,7 @@ class TestCephVolumeModule(object):
     def test_zap_osd_container(self):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda'}
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + \
             [fake_container_image,
                 '--cluster',
@@ -167,7 +167,7 @@ class TestCephVolumeModule(object):
     def test_list_osd_container(self):
         fake_module = MagicMock()
         fake_module.params = {'cluster': 'ceph', 'data': '/dev/sda'}
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd(
                                 {
                                     '/var/lib/ceph': '/var/lib/ceph:ro'
@@ -196,7 +196,7 @@ class TestCephVolumeModule(object):
 
     def test_list_storage_inventory_container(self):
         fake_module = MagicMock()
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + \
             [fake_container_image,
                 '--cluster',
@@ -214,7 +214,7 @@ class TestCephVolumeModule(object):
                               'cluster': 'ceph', }
 
         fake_action = "create"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + \
             [fake_container_image,
                 '--cluster',
@@ -257,7 +257,7 @@ class TestCephVolumeModule(object):
                               'cluster': 'ceph', }
 
         fake_action = "prepare"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + \
             [fake_container_image,
                 '--cluster',
@@ -302,7 +302,7 @@ class TestCephVolumeModule(object):
                               'cluster': 'ceph',
                               'batch_devices': ["/dev/sda", "/dev/sdb"]}
 
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
+        fake_container_image = "quay.io/ceph/daemon:latest"
         expected_command_list = get_container_cmd() + \
             [fake_container_image,
                 '--cluster',

diff --git a/tests/library/test_ceph_volume_simple_activate.py b/tests/library/test_ceph_volume_simple_activate.py
index 9efe36b7df749158058e0d954855a509a9ce6a8b..8eb1707c4f09fe5d8b33bc02215cc2c980ade5c4 100644 (file)
--- a/tests/library/test_ceph_volume_simple_activate.py
+++ b/tests/library/test_ceph_volume_simple_activate.py
@@ -6,7 +6,7 @@ import ceph_volume_simple_activate
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_id = '42'
 fake_uuid = '0c4a7eca-0c2a-4c12-beff-08a80f064c52'
 fake_path = '/etc/ceph/osd/{}-{}.json'.format(fake_id, fake_uuid)

diff --git a/tests/library/test_ceph_volume_simple_scan.py b/tests/library/test_ceph_volume_simple_scan.py
index a92452c3d8d99ea76b774b00c17ddc3a8c11403a..f43dec4c00a4bf5763f30ee78f0d0027e5be5af5 100644 (file)
--- a/tests/library/test_ceph_volume_simple_scan.py
+++ b/tests/library/test_ceph_volume_simple_scan.py
@@ -6,7 +6,7 @@ import ceph_volume_simple_scan
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_path = '/var/lib/ceph/osd/ceph-0'
 
 

diff --git a/tests/library/test_cephadm_adopt.py b/tests/library/test_cephadm_adopt.py
index 4f091ee3c144a4b3ef2766b81498be89cde2106e..36e3bbfa8e75dd2cb6127bd942b9b0c58a728167 100644 (file)
--- a/tests/library/test_cephadm_adopt.py
+++ b/tests/library/test_cephadm_adopt.py
@@ -4,7 +4,7 @@ import ca_test_common
 import cephadm_adopt
 
 fake_cluster = 'ceph'
-fake_image = 'quay.ceph.io/ceph/daemon-base:latest'
+fake_image = 'quay.io/ceph/daemon-base:latest'
 fake_name = 'mon.foo01'
 
 

diff --git a/tests/library/test_cephadm_bootstrap.py b/tests/library/test_cephadm_bootstrap.py
index b9bbe0453f408d5e6e043d2ff0e23c364a4f8b57..1703d3dcad642e1770199659da95f4c22c42358d 100644 (file)
--- a/tests/library/test_cephadm_bootstrap.py
+++ b/tests/library/test_cephadm_bootstrap.py
@@ -4,9 +4,9 @@ import ca_test_common
 import cephadm_bootstrap
 
 fake_fsid = '0f1e0605-db0b-485c-b366-bd8abaa83f3b'
-fake_image = 'quay.ceph.io/ceph/daemon-base:latest-master-devel'
+fake_image = 'quay.io/ceph/daemon-base:latest-pacific-devel'
 fake_ip = '192.168.42.1'
-fake_registry = 'quay.ceph.io'
+fake_registry = 'quay.io'
 fake_registry_user = 'foo'
 fake_registry_pass = 'bar'
 fake_registry_json = 'registry.json'

diff --git a/tox-cephadm.ini b/tox-cephadm.ini
index a8cea99b137bce5d35d6b01648e1e8a2ce5010b0..5a9585b49bf11016139f5ccfdc8bc1a1f9c98584 100644 (file)
--- a/tox-cephadm.ini
+++ b/tox-cephadm.ini
@@ -4,7 +4,7 @@ envlist = centos-container-cephadm
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     pip

diff --git a/tox-docker2podman.ini b/tox-docker2podman.ini
index b5a6ff5b8572475729753c9b687ec5428b4c691f..2ece9f2aa87d842bef6333ba292737656a579ed3 100644 (file)
--- a/tox-docker2podman.ini
+++ b/tox-docker2podman.ini
@@ -4,7 +4,7 @@ envlist = centos-container-docker_to_podman
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     pip

diff --git a/tox-external_clients.ini b/tox-external_clients.ini
index 207193e7570c3233f8a2ac61580eba0c2558147c..5a47a2b85b671fbf1e4e64ec45c40da0749810fc 100644 (file)
--- a/tox-external_clients.ini
+++ b/tox-external_clients.ini
@@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-external_clients
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git

diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini
index fe021bb3a5c95f9e82ec2ad9d894d45300524862..b2fb1a98e477e3c755a856b55a75a284be6126ce 100644 (file)
--- a/tox-filestore_to_bluestore.ini
+++ b/tox-filestore_to_bluestore.ini
@@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-filestore_to_bluestore
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git

diff --git a/tox-podman.ini b/tox-podman.ini
index 1c9307a3e39a6a5eb49f1b34e775613f587db33c..2af8c5a1172f5741d301bf1f5058d293d9f6d154 100644 (file)
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -4,7 +4,7 @@ envlist = centos-container-podman
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     pip

diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index 5a34050163c683010674cb3d72879d2caf1bed89..c5e8be07009713a0ea18077e6c83461da58bd8d3 100644 (file)
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -45,7 +45,7 @@ commands=
   "
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
 passenv=*

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 975bc08d37f4c89e90413c7c53556dfa99666952..e5e2c5c918f01edefedab8c5c74d5dd3bd7b5652 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-subset_update
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git
@@ -44,8 +44,8 @@ commands=
   # deploy the cluster
   bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_docker_registry=quay.ceph.io \
-      ceph_docker_image=ceph-ci/daemon \
+      ceph_docker_registry=quay.io \
+      ceph_docker_image=ceph/daemon \
       ceph_docker_image_tag=latest-octopus \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \

diff --git a/tox-update.ini b/tox-update.ini
index a1d9b12f55027ac2774a60060d79054c416f9a93..27fb8649f8906c41b83de93db6afcc7da3e9c79d 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-update
 skipsdist = True
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git
@@ -50,8 +50,8 @@ commands=
   # When rendering the ganesha.conf.j2 template, it complains because of undefined variables in the block "{% if nfs_obj_gw | bool %}" although we explicitly set this variable to false (see below).
   bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \

diff --git a/tox.ini b/tox.ini
index 2f5b57e43001fc13257044b3aa92903582e817a9..bb0e902625ddfd75139711a6c1f84d90753eb41a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ skipsdist = True
 
 # a test scenario for the lv-create.yml and lv-teardown playbooks
 [testenv:infra_lv_create]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     mkdir
@@ -43,16 +43,16 @@ commands=
 [purge]
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
   "
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
       ireallymeanit=yes \
       remove_packages=yes \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
   "
 
@@ -72,8 +72,8 @@ commands=
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/purge-dashboard.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
   "
 
@@ -149,8 +149,8 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
       ireallymeanit=yes \
       ceph_docker_image_tag=latest-pacific-devel \
-      ceph_docker_registry=quay.ceph.io \
-      ceph_docker_image=ceph-ci/daemon \
+      ceph_docker_registry=quay.io \
+      ceph_docker_image=ceph/daemon \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -259,7 +259,7 @@ commands=
   "
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     pip
@@ -334,7 +334,7 @@ commands=
   !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2'
   lvm_osds,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit osd2
 
-  rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
+  rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml