From 4bdccef534d6635a1355c85bb634a2e1ad5c1118 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 6 Dec 2022 13:14:07 +0100 Subject: [PATCH] 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 (cherry picked from commit e55ca0188190173320ca77c62d2a908e9e8f5c61) --- docs/source/installation/containerized.rst | 4 +- docs/source/testing/tox.rst | 4 +- library/cephadm_adopt.py | 4 +- library/cephadm_bootstrap.py | 4 +- .../add-mdss/container/group_vars/all | 6 +-- .../add-mgrs/container/group_vars/all | 6 +-- .../add-mons/container/group_vars/all | 6 +-- .../add-osds/container/group_vars/all | 6 +-- .../add-rbdmirrors/container/group_vars/all | 6 +-- .../add-rgws/container/group_vars/all | 6 +-- .../all-in-one/container/group_vars/all | 6 +-- .../all_daemons/container/group_vars/all | 12 +++--- tests/functional/all_daemons/group_vars/all | 10 ++--- tests/functional/cephadm/group_vars/all | 4 +- .../collocation/container/group_vars/all | 12 +++--- tests/functional/collocation/group_vars/all | 10 ++--- tests/functional/docker2podman/group_vars/all | 12 +++--- .../container/inventory/group_vars/all | 6 +-- .../container/group_vars/all | 6 +-- .../container/group_vars/all | 6 +-- .../lvm-batch/container/group_vars/all | 6 +-- .../lvm-osds/container/group_vars/all | 6 +-- tests/functional/ooo-collocation/hosts | 4 +- tests/functional/podman/group_vars/all | 12 +++--- .../rbdmirror/container/group_vars/all | 6 +-- .../container/secondary/group_vars/all | 6 +-- .../rgw-multisite/container/group_vars/all | 4 +- .../container/secondary/group_vars/all | 4 +- .../shrink_mds/container/group_vars/all | 6 +-- .../shrink_mgr/container/group_vars/all | 6 +-- .../shrink_mon/container/group_vars/all | 6 +-- .../shrink_osd/container/group_vars/all | 6 +-- .../shrink_rbdmirror/container/group_vars/all | 6 +-- .../shrink_rgw/container/group_vars/all | 6 +-- .../subset_update/container/group_vars/all | 12 +++--- tests/functional/subset_update/group_vars/all | 10 ++--- tests/library/test_ceph_crush_rule.py | 2 +- tests/library/test_ceph_key.py | 38 +++++++++---------- tests/library/test_ceph_mgr_module.py | 2 +- tests/library/test_ceph_osd.py | 2 +- tests/library/test_ceph_osd_flag.py | 2 +- tests/library/test_ceph_pool.py | 2 +- tests/library/test_ceph_volume.py | 14 +++---- .../test_ceph_volume_simple_activate.py | 2 +- tests/library/test_ceph_volume_simple_scan.py | 2 +- tests/library/test_cephadm_adopt.py | 2 +- tests/library/test_cephadm_bootstrap.py | 4 +- tox-cephadm.ini | 2 +- tox-docker2podman.ini | 2 +- tox-external_clients.ini | 2 +- tox-filestore_to_bluestore.ini | 2 +- tox-podman.ini | 2 +- tox-shrink_osd.ini | 2 +- tox-subset_update.ini | 2 +- tox-update.ini | 8 ++-- tox.ini | 22 +++++------ 56 files changed, 179 insertions(+), 179 deletions(-) diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst index b11153572..3333bbdd5 100644 --- 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 ae845d2bb..e2c3a3286 100644 --- 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 d9472745c..723e0a46c 100644 --- 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 a1b7ebfcf..f7d2cbdca 100644 --- 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 74117147c..966bcc395 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all index 7160f37f7..812f8609c 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index 213ef7f90..ffa5ff2f8 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 0655d9ed4..5107cf6ff 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all index 0e9bda9e4..21b8c5be6 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all index da5185f96..70a5e4c5e 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index 694d07e42..b819e2776 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 44a80f51a..155a3630d 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -36,10 +36,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-quincy -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 93aac4c40..efd2430cf 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -30,9 +30,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 e76af0a5d..5b9e1e623 100644 --- 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-quincy-devel containerized_deployment: true diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index 4629cfd30..fe9a8c0f9 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -25,10 +25,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-quincy -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 +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 a58129720..423ffbac7 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -22,8 +22,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 18c76d72f..f5b4b796e 100644 --- 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-quincy -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 +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 bfac74cd2..7a39522e1 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all index a31bf8ac0..d5cf6072a 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all index b46b488b9..9f2b392a8 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index 5c28b0fa7..a6ccb4ccf 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 2cb59f325..b0161d169 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index c2c9d05f2..d6532a4ab 100644 --- 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-quincy - 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 95b205d27..b28357831 100644 --- 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-quincy -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 +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 71de37c52..f4e722ab0 100644 --- 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-quincy diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all index 93d4ad0f8..7da212eab 100644 --- 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-quincy diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all index 9175b75ac..07575407c 100644 --- 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-quincy diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all index 24307c87b..caa0c08b0 100644 --- 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-quincy diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all index e69575742..78bfe5586 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all index 7a5fe3a4c..fa063a4f7 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all index 8c49f2207..52e9bfad2 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all index 3d1450b83..42e0cbef3 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all index 042f50b4c..96802b86e 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all index f49e0030f..f58360648 100644 --- 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-quincy \ No newline at end of file +ceph_docker_registry: quay.io +ceph_docker_image: ceph/daemon +ceph_docker_image_tag: latest-quincy diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all index 9363025a8..acbe5d90a 100644 --- 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-quincy -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 a107e33d2..13725dd32 100644 --- 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 68e0c97e1..e3bd9b173 100644 --- 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 5b3d10391..956bc93ef 100644 --- a/tests/library/test_ceph_key.py +++ b/tests/library/test_ceph_key.py @@ -75,7 +75,7 @@ class TestCephKeyModule(object): fake_args = ['arg'] fake_user = "fake-user" fake_user_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', @@ -84,7 +84,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', @@ -143,7 +143,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', @@ -152,7 +152,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', @@ -211,7 +211,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', @@ -221,7 +221,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, @@ -235,7 +235,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, @@ -298,7 +298,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', @@ -307,7 +307,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', @@ -341,7 +341,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', @@ -350,7 +350,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, @@ -380,7 +380,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', @@ -389,7 +389,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, @@ -415,7 +415,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) @@ -427,7 +427,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, @@ -472,7 +472,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', @@ -481,7 +481,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, @@ -494,7 +494,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', @@ -503,7 +503,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 efd87bf08..d426a9503 100644 --- 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 dc5c6ab51..6d1f3141b 100644 --- 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 5f99f1e2f..bbc865eef 100644 --- 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 c9e831c08..2ce40560f 100644 --- 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 0db724250..e51c52b1b 100644 --- a/tests/library/test_ceph_volume.py +++ b/tests/library/test_ceph_volume.py @@ -77,7 +77,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 @@ -85,7 +85,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', @@ -168,7 +168,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' @@ -197,7 +197,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', @@ -215,7 +215,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', @@ -258,7 +258,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', @@ -303,7 +303,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 9efe36b7d..8eb1707c4 100644 --- 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 a92452c3d..f43dec4c0 100644 --- 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 4f091ee3c..36e3bbfa8 100644 --- 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 fad7cc14b..9a905d780 100644 --- 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-quincy-devel' +fake_image = 'quay.io/ceph/daemon-base:latest-main-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 e44448fa1..5714eb908 100644 --- 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 33beb5508..b6e426bc0 100644 --- 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 5db9ac71f..8981b9ac5 100644 --- 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 dfa3e070a..ef5ec2ea7 100644 --- 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 ce0020b26..ca776bbd5 100644 --- 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 2c55f6ce7..3356a21d1 100644 --- 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 b2e81575e..13f703319 100644 --- 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 diff --git a/tox-update.ini b/tox-update.ini index 5cc7aefdd..9a78683b6 100644 --- 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 @@ -60,9 +60,9 @@ 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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \ + 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-quincy} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ diff --git a/tox.ini b/tox.ini index 7843f44ca..4cd432382 100644 --- 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-quincy} \ " 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-quincy} \ " @@ -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-quincy} \ " @@ -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-quincy-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} \ @@ -260,7 +260,7 @@ commands= " [testenv] -whitelist_externals = +allowlist_externals = vagrant bash pip @@ -337,7 +337,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 -- 2.39.5