From 2001039c0e290b1643311d6ea10c9f767adf11ee Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 4 Sep 2020 16:50:26 +0200 Subject: [PATCH] tests: migrate to quay.ceph.io registry in order to avoid docker.io rate limiting Signed-off-by: Guillaume Abrioux (cherry picked from commit 218aedaab66b1d07a69e635951baceb83e15cd78) --- docs/source/testing/tox.rst | 4 +- .../add-mdss/container/group_vars/all | 5 +- .../add-mgrs/container/group_vars/all | 5 +- .../add-mons/container/group_vars/all | 5 +- .../add-osds/container/group_vars/all | 5 +- .../add-rbdmirrors/container/group_vars/all | 5 +- .../add-rgws/container/group_vars/all | 5 +- .../all-in-one/container/group_vars/all | 5 +- .../all_daemons/container/group_vars/all | 8 ++- tests/functional/all_daemons/group_vars/all | 8 ++- .../collocation/container/group_vars/all | 8 ++- tests/functional/collocation/group_vars/all | 8 ++- tests/functional/docker2podman/group_vars/all | 5 +- .../container/inventory/group_vars/all | 5 +- .../container/group_vars/all | 5 +- .../container/group_vars/all | 5 +- .../lvm-batch/container/group_vars/all | 5 +- .../lvm-osds/container/group_vars/all | 5 +- tests/functional/ooo-collocation/hosts | 6 +- tests/functional/podman/group_vars/all | 5 +- .../rgw-multisite/container/group_vars/all | 5 +- .../container/secondary/group_vars/all | 5 +- .../shrink_mds/container/group_vars/all | 5 +- .../shrink_mgr/container/group_vars/all | 5 +- .../shrink_mon/container/group_vars/all | 5 +- .../shrink_osd/container/group_vars/all | 5 +- .../shrink_rbdmirror/container/group_vars/all | 5 +- .../shrink_rgw/container/group_vars/all | 5 +- tests/library/test_ceph_key.py | 38 ++++++------ tests/library/test_ceph_volume.py | 28 ++++----- tox-docker2podman.ini | 6 -- tox-external_clients.ini | 6 -- tox-filestore_to_bluestore.ini | 6 -- tox-podman.ini | 3 - tox-shrink_osd.ini | 33 ----------- tox-update.ini | 7 +-- tox.ini | 58 ++----------------- 37 files changed, 162 insertions(+), 175 deletions(-) diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst index 52e38427c..933b15f65 100644 --- a/docs/source/testing/tox.rst +++ b/docs/source/testing/tox.rst @@ -30,9 +30,9 @@ The following environent variables are available for use: * ``UPDATE_CEPH_STABLE_RELEASE``: (default: ``kraken``) This would configure the ``ceph-ansible`` variable ``ceph_stable_relese`` during an ``update`` scenario. This is set automatically when using the ``jewel-*`` or ``kraken-*`` testing scenarios. -* ``CEPH_DOCKER_REGISTRY``: (default: ``docker.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``. +* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``. -* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``. +* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/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/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all index 53004263c..6f3e79246 100644 --- a/tests/functional/add-mdss/container/group_vars/all +++ b/tests/functional/add-mdss/container/group_vars/all @@ -24,4 +24,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all index 2ca46b724..2f10af8e1 100644 --- a/tests/functional/add-mgrs/container/group_vars/all +++ b/tests/functional/add-mgrs/container/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index feb44cc5c..dcbee1eb1 100644 --- a/tests/functional/add-mons/container/group_vars/all +++ b/tests/functional/add-mons/container/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index dce64e858..021f20c4f 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -24,4 +24,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all index c4b5eb011..460c5c71e 100644 --- a/tests/functional/add-rbdmirrors/container/group_vars/all +++ b/tests/functional/add-rbdmirrors/container/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all index b0ce8d72c..33f386334 100644 --- a/tests/functional/add-rgws/container/group_vars/all +++ b/tests/functional/add-rgws/container/group_vars/all @@ -27,4 +27,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 rgw_override_bucket_index_max_shards: 16 rgw_bucket_default_quota_max_objects: 1638400 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index 5662f58da..455cc7d66 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -40,4 +40,7 @@ lvm_volumes: - data: data-lv2 data_vg: test_group db: journal1 - db_vg: journals \ No newline at end of file + db_vg: journals +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 265bd5ab0..e7771c609 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -41,4 +41,10 @@ handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 mds_max_mds: 2 dashboard_admin_password: $sX!cD$rYU6qR^B! -grafana_admin_password: +xFRe+RES@7vg24n \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus +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" \ No newline at end of file diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index 6b4eec29e..517519443 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -34,4 +34,10 @@ handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 mds_max_mds: 2 dashboard_admin_password: $sX!cD$rYU6qR^B! -grafana_admin_password: +xFRe+RES@7vg24n \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus +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" \ No newline at end of file diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index 347ef3dcb..831354507 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -21,4 +21,10 @@ handler_health_mon_check_delay: 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 \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus +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" \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index b1e30375b..b109cc709 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -18,4 +18,10 @@ handler_health_mon_check_delay: 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 \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus +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" \ No newline at end of file diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index b0b7541fc..ad823da8c 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -41,4 +41,7 @@ openstack_pools: 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 \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all index 095003acf..2bd0e1a35 100644 --- a/tests/functional/external_clients/container/inventory/group_vars/all +++ b/tests/functional/external_clients/container/inventory/group_vars/all @@ -36,4 +36,7 @@ lvm_volumes: db: journal1 db_vg: journals fsid: 40358a87-ab6e-4bdc-83db-1d909147861c -generate_fsid: false \ No newline at end of file +generate_fsid: false +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all index 96f816016..8f3fa777f 100644 --- a/tests/functional/filestore-to-bluestore/container/group_vars/all +++ b/tests/functional/filestore-to-bluestore/container/group_vars/all @@ -21,4 +21,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 dashboard_enabled: False handler_health_mon_check_delay: 10 -handler_health_osd_check_delay: 10 \ No newline at end of file +handler_health_osd_check_delay: 10 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all index 1e550bea3..ac6994009 100644 --- a/tests/functional/lvm-auto-discovery/container/group_vars/all +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -24,4 +24,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 dashboard_enabled: False handler_health_mon_check_delay: 10 -handler_health_osd_check_delay: 10 \ No newline at end of file +handler_health_osd_check_delay: 10 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index fa97ee5f7..77fa7a97d 100644 --- a/tests/functional/lvm-batch/container/group_vars/all +++ b/tests/functional/lvm-batch/container/group_vars/all @@ -26,4 +26,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 dashboard_enabled: False handler_health_mon_check_delay: 10 -handler_health_osd_check_delay: 10 \ No newline at end of file +handler_health_osd_check_delay: 10 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 1668c947e..1d483e1e8 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -41,4 +41,7 @@ openstack_cinder_pool: application: rbd openstack_pools: - "{{ openstack_glance_pool }}" - - "{{ openstack_cinder_pool }}" \ No newline at end of file + - "{{ openstack_cinder_pool }}" +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index e8ecb039a..609478d50 100644 --- a/tests/functional/ooo-collocation/hosts +++ b/tests/functional/ooo-collocation/hosts @@ -9,9 +9,9 @@ all: rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0} ceph_mgr_docker_extra_env: '-e MGR_DASHBOARD=0' cluster: mycluster - ceph_docker_image: ceph/daemon - ceph_docker_image_tag: v3.0.3-stable-3.0-luminous-centos-7-x86_64 - ceph_docker_registry: docker.io + ceph_docker_image: ceph-ci/daemon + ceph_docker_image_tag: latest-nautilus + ceph_docker_registry: quay.ceph.io cephfs_data_pool: name: 'manila_data' pg_num: "{{ osd_pool_default_pg_num }}" diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index 4b9ff4941..495837f15 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -40,4 +40,7 @@ openstack_pools: 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 \ No newline at end of file +grafana_admin_password: +xFRe+RES@7vg24n +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all index 3a7955519..8f8640f09 100644 --- a/tests/functional/rgw-multisite/container/group_vars/all +++ b/tests/functional/rgw-multisite/container/group_vars/all @@ -24,4 +24,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all index 8a5ac17fe..4d545f7ed 100644 --- a/tests/functional/rgw-multisite/container/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all @@ -24,4 +24,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all index 306cf41a0..e621da450 100644 --- a/tests/functional/shrink_mds/container/group_vars/all +++ b/tests/functional/shrink_mds/container/group_vars/all @@ -14,4 +14,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 openstack_config: False dashboard_enabled: False -copy_admin_key: True \ No newline at end of file +copy_admin_key: True +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all index bb6a1d4d6..c26ebb3d6 100644 --- a/tests/functional/shrink_mgr/container/group_vars/all +++ b/tests/functional/shrink_mgr/container/group_vars/all @@ -13,4 +13,7 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 openstack_config: False -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all index 78dc17390..9801d081a 100644 --- a/tests/functional/shrink_mon/container/group_vars/all +++ b/tests/functional/shrink_mon/container/group_vars/all @@ -13,4 +13,7 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 openstack_config: False -dashboard_enabled: False \ No newline at end of file +dashboard_enabled: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all index bc458f80a..c257f6103 100644 --- a/tests/functional/shrink_osd/container/group_vars/all +++ b/tests/functional/shrink_osd/container/group_vars/all @@ -14,4 +14,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 openstack_config: False dashboard_enabled: False -copy_admin_key: True \ No newline at end of file +copy_admin_key: True +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all index 0594e228e..abdd93bd4 100644 --- a/tests/functional/shrink_rbdmirror/container/group_vars/all +++ b/tests/functional/shrink_rbdmirror/container/group_vars/all @@ -13,4 +13,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 openstack_config: False dashboard_enabled: False -copy_admin_key: True \ No newline at end of file +copy_admin_key: True +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all index 1b376c9ca..e49c96ba8 100644 --- a/tests/functional/shrink_rgw/container/group_vars/all +++ b/tests/functional/shrink_rgw/container/group_vars/all @@ -15,4 +15,7 @@ ceph_conf_overrides: osd_pool_default_size: 1 openstack_config: False dashboard_enabled: False -copy_admin_key: True \ No newline at end of file +copy_admin_key: True +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-nautilus \ No newline at end of file diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py index 18bc486c2..755eb8676 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_key = "/tmp/my-key" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" 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', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', "fake-user", '-k', @@ -138,7 +138,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 = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', @@ -147,7 +147,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-authtool', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--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 = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [ ['docker', # noqa E128 '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', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--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', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring', '--cluster', fake_cluster, @@ -286,7 +286,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 = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [['docker', # noqa E128 'run', '--rm', @@ -295,7 +295,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-authtool', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--create-keyring', fake_file_destination, '--name', @@ -325,7 +325,7 @@ class TestCephKeyModule(object): def test_delete_key_container(self): fake_cluster = "fake" fake_name = "client.fake" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [['docker', # noqa E128 'run', '--rm', @@ -334,7 +334,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring', '--cluster', fake_cluster, @@ -364,7 +364,7 @@ class TestCephKeyModule(object): fake_user = "fake-user" fake_key = "/tmp/my-key" fake_output_format = "json" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [['docker', # noqa E128 'run', '--rm', @@ -373,7 +373,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', "fake-user", '-k', "/tmp/my-key", '--cluster', fake_cluster, @@ -398,7 +398,7 @@ class TestCephKeyModule(object): def test_get_key_container(self): fake_cluster = "fake" fake_name = "client.fake" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" fake_dest = "/fake/ceph" fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring" fake_file_destination = os.path.join(fake_dest, fake_keyring_filename) @@ -410,7 +410,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', "client.admin", '-k', "/etc/ceph/fake.client.admin.keyring", # noqa E501 '--cluster', fake_cluster, @@ -454,7 +454,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') # noqa E501 - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [['docker', # noqa E128 'run', '--rm', @@ -463,7 +463,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', "mon.", '-k', "/var/lib/ceph/mon/fake-mon01/keyring", # noqa E501 '--cluster', fake_cluster, @@ -477,7 +477,7 @@ class TestCephKeyModule(object): fake_cluster = "fake" fake_user = "fake-user" fake_key = "/tmp/my-key" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = [['docker', # noqa E128 'run', '--rm', @@ -486,7 +486,7 @@ class TestCephKeyModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '-n', "fake-user", '-k', "/tmp/my-key", '--cluster', fake_cluster, diff --git a/tests/library/test_ceph_volume.py b/tests/library/test_ceph_volume.py index 07e5466ee..0f7d40590 100644 --- a/tests/library/test_ceph_volume.py +++ b/tests/library/test_ceph_volume.py @@ -53,7 +53,7 @@ class TestCephVolumeModule(object): def test_container_exec(self): fake_binary = "ceph-volume" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -63,14 +63,14 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous'] + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus'] result = ceph_volume.container_exec(fake_binary, fake_container_image) assert result == expected_command_list def test_zap_osd_container(self): fake_module = MagicMock() fake_module.params = {'data': '/dev/sda'} - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -80,7 +80,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'lvm', @@ -147,7 +147,7 @@ class TestCephVolumeModule(object): def test_list_osd_container(self): fake_module = MagicMock() fake_module.params = {'cluster': 'ceph', 'data': '/dev/sda'} - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -157,7 +157,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'lvm', @@ -182,7 +182,7 @@ class TestCephVolumeModule(object): def test_list_storage_inventory_container(self): fake_module = MagicMock() - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -192,7 +192,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'inventory', @@ -208,7 +208,7 @@ class TestCephVolumeModule(object): 'cluster': 'ceph', } fake_action = "create" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -218,7 +218,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'lvm', @@ -257,7 +257,7 @@ class TestCephVolumeModule(object): 'cluster': 'ceph', } fake_action = "prepare" - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -267,7 +267,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'lvm', @@ -307,7 +307,7 @@ class TestCephVolumeModule(object): 'cluster': 'ceph', 'batch_devices': ["/dev/sda", "/dev/sdb"]} - fake_container_image = "docker.io/ceph/daemon:latest-luminous" + fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus" expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '--ulimit', 'nofile=1024:4096', '-v', '/run/lock/lvm:/run/lock/lvm:z', @@ -317,7 +317,7 @@ class TestCephVolumeModule(object): '-v', '/var/lib/ceph/:/var/lib/ceph/:z', '-v', '/var/log/ceph/:/var/log/ceph/:z', '--entrypoint=ceph-volume', - 'docker.io/ceph/daemon:latest-luminous', + 'quay.ceph.io/ceph-ci/daemon:latest-nautilus', '--cluster', 'ceph', 'lvm', diff --git a/tox-docker2podman.ini b/tox-docker2podman.ini index 6c26fcb8a..ee28ab8a5 100644 --- a/tox-docker2podman.ini +++ b/tox-docker2podman.ini @@ -39,9 +39,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site-container.yml.sample --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -50,9 +47,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/docker-to-podman.yml --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests diff --git a/tox-external_clients.ini b/tox-external_clients.ini index 57770e3de..3dd70b626 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -42,9 +42,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release=nautilus \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image=ceph/daemon \ - ceph_docker_image_tag=latest-nautilus \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -59,9 +56,6 @@ commands= external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \ generate_fsid=false \ ceph_stable_release=nautilus \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image=ceph/daemon \ - ceph_docker_image_tag=latest-nautilus \ 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-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index b21fa0abf..8f14cbace 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -51,9 +51,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -62,9 +59,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" diff --git a/tox-podman.ini b/tox-podman.ini index 3d35c84d3..c747a2ecd 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -45,9 +45,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ container_binary=podman \ container_package_name=podman \ diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini index e33ead999..e0ab8e03c 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -7,58 +7,34 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=0 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=1 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=2 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=3 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=4 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=5 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=6 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=7 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " [shrink-osd-multiple] @@ -66,9 +42,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=0,1,2,3,4,5,6,7 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " [testenv] @@ -121,9 +94,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -143,9 +113,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ 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-update.ini b/tox-update.ini index 2b20481de..0490f0d07 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -54,8 +54,8 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ + 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-luminous} \ "' @@ -64,9 +64,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ 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 fefcc1b5a..41bd02b17 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,7 @@ commands= ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " # wait 30sec for services to be ready @@ -61,7 +61,7 @@ commands= fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-master} \ + ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_stable_release=nautilus \ osd_scenario=lvm \ " @@ -113,20 +113,13 @@ commands= # can be redployed to. [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:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ - " + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " # re-setup lvm @@ -136,9 +129,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -153,9 +143,6 @@ commands= remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -167,9 +154,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " # test that the cluster can be redeployed in a healthy state py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -185,9 +169,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill={env:OSD_TO_KILL:0} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " [shrink-mgr] @@ -223,9 +204,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -240,9 +218,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ " py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -254,9 +229,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -270,9 +242,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -286,9 +255,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -302,9 +268,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -318,9 +281,6 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -340,15 +300,12 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}" - ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}" + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.yml + ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/rgw_multisite.yml bash -c "cd {changedir}/secondary && vagrant destroy --force" # clean rule after the scenario is complete ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=absent' @@ -447,9 +404,6 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -469,7 +423,7 @@ commands= all_daemons: py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests # handlers/idempotency test - all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-nautilus} " --extra-vars @ceph-override.json + all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-nautilus}" --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands} -- 2.39.5