From: Guillaume Abrioux Date: Fri, 4 Sep 2020 14:50:26 +0000 (+0200) Subject: tests: migrate to quay.ceph.io registry X-Git-Tag: v3.2.51~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=470c1d821cf307c50912ad2c60238d3300ba119d;p=ceph-ansible.git tests: migrate to quay.ceph.io registry in order to avoid docker.io rate limiting Signed-off-by: Guillaume Abrioux (cherry picked from commit 2001039c0e290b1643311d6ea10c9f767adf11ee) --- 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/library/test_ceph_volume.py b/library/test_ceph_volume.py index 3f6d6508b..9ccd9c129 100644 --- a/library/test_ceph_volume.py +++ b/library/test_ceph_volume.py @@ -36,9 +36,9 @@ class TestCephVolumeModule(object): result = ceph_volume.get_wal("wal-lv", "wal-vg") assert result == "wal-vg/wal-lv" - def test_container_exec(sefl): + 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-luminous" 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', @@ -48,14 +48,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-luminous'] 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-luminous" 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', @@ -65,7 +65,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-luminous', 'lvm', 'zap', '--destroy', @@ -124,7 +124,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-luminous" 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', @@ -134,7 +134,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-luminous', '--cluster', 'ceph', 'lvm', @@ -152,7 +152,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-luminous" 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', @@ -162,7 +162,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-luminous', '--cluster', 'ceph', 'lvm', @@ -201,7 +201,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-luminous" 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', @@ -211,7 +211,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-luminous', '--cluster', 'ceph', 'lvm', @@ -251,7 +251,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-luminous" 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', @@ -261,7 +261,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-luminous', '--cluster', 'ceph', 'lvm', diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 7ba959aff..94feec63d 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file +ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index f7934ad0b..dbf3df0cf 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -36,4 +36,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-luminous \ 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 44f030890..06425832d 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -38,3 +38,6 @@ openstack_pools: - "{{ openstack_glance_pool }}" - "{{ openstack_cinder_pool }}" mds_max_mds: 2 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index a581917c3..262969b54 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -32,3 +32,6 @@ openstack_pools: - "{{ openstack_glance_pool }}" - "{{ openstack_cinder_pool }}" mds_max_mds: 2 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/bs-lvm-osds/container/group_vars/all b/tests/functional/bs-lvm-osds/container/group_vars/all index 6f4e785cc..db917c0eb 100644 --- a/tests/functional/bs-lvm-osds/container/group_vars/all +++ b/tests/functional/bs-lvm-osds/container/group_vars/all @@ -26,4 +26,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file +ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index 71554cfd3..a3e13faf7 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -15,4 +15,7 @@ rgw_bucket_default_quota_max_objects: 1638400 ceph_conf_overrides: global: osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 \ No newline at end of file + osd_pool_default_size: 1 +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index fd3f30827..30ad68c9d 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -13,4 +13,4 @@ rgw_bucket_default_quota_max_objects: 1638400 ceph_conf_overrides: global: osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 \ No newline at end of file + osd_pool_default_size: 1 diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index b8c2390b0..933854ea0 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -42,3 +42,6 @@ openstack_pools: - "{{ openstack_cinder_pool }}" 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-luminous diff --git a/tests/functional/external_clients/container/group_vars/all b/tests/functional/external_clients/container/group_vars/all index 1b45da8bc..619c526aa 100644 --- a/tests/functional/external_clients/container/group_vars/all +++ b/tests/functional/external_clients/container/group_vars/all @@ -35,4 +35,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-luminous \ 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 83ff32de5..c13878373 100644 --- a/tests/functional/lvm-auto-discovery/container/group_vars/all +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -24,3 +24,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index 9360bafbe..7c7170e7f 100644 --- a/tests/functional/lvm-batch/container/group_vars/all +++ b/tests/functional/lvm-batch/container/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file +ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index c6119f8ec..73d055462 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -29,3 +29,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index 388298af8..f115edc6f 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.2.5-stable-3.2-luminous-centos-7 - ceph_docker_registry: docker.io + ceph_docker_image: ceph-ci/daemon + ceph_docker_image_tag: v3.2.14-stable-3.2-luminous-centos-7-x86_64 + ceph_docker_registry: quay.ceph.io ceph_origin: repository ceph_repository: community ceph_release: luminous diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all index 1949c2164..ba3d797a8 100644 --- a/tests/functional/rgw-multisite/container/group_vars/all +++ b/tests/functional/rgw-multisite/container/group_vars/all @@ -26,3 +26,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all index bb51d7930..154b26930 100644 --- a/tests/functional/rgw-multisite/container/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all @@ -25,4 +25,7 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file +ceph_osd_docker_run_script_path: /var/tmp +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all index f0bdd3aed..4579a0f8e 100644 --- a/tests/functional/shrink_mon/container/group_vars/all +++ b/tests/functional/shrink_mon/container/group_vars/all @@ -13,3 +13,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 openstack_config: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all index a4806c26f..1c8b85189 100644 --- a/tests/functional/shrink_osd/container/group_vars/all +++ b/tests/functional/shrink_osd/container/group_vars/all @@ -13,3 +13,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 openstack_config: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tests/functional/shrink_osd_legacy/container/group_vars/all b/tests/functional/shrink_osd_legacy/container/group_vars/all index 7b45071dc..2e408c93c 100644 --- a/tests/functional/shrink_osd_legacy/container/group_vars/all +++ b/tests/functional/shrink_osd_legacy/container/group_vars/all @@ -13,3 +13,6 @@ ceph_conf_overrides: global: osd_pool_default_size: 1 openstack_config: False +ceph_docker_registry: quay.ceph.io +ceph_docker_image: ceph-ci/daemon +ceph_docker_image_tag: latest-luminous diff --git a/tox-docker2podman.ini b/tox-docker2podman.ini index fd205fee1..c5e4e4150 100644 --- a/tox-docker2podman.ini +++ b/tox-docker2podman.ini @@ -37,10 +37,7 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " pip uninstall -y ansible @@ -50,10 +47,7 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ansible_python_interpreter=/usr/bin/python2 \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " # install podman ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/docker2podman.yml -e ansible_python_interpreter=/usr/bin/python2 diff --git a/tox-external_clients.ini b/tox-external_clients.ini index 3b5915f75..2faa6fad1 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -45,10 +45,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit 'all:!clients' --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_stable_release=luminous \ - ceph_docker_image=ceph/daemon \ - ceph_docker_image_tag=latest-luminous \ " ansible-playbook -vv -i {changedir}/external_clients-hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ @@ -58,9 +55,6 @@ commands= external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \ generate_fsid=false \ ceph_stable_release=luminous \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image=ceph/daemon \ - ceph_docker_image_tag=latest-luminous \ " bash -c "CEPH_STABLE_RELEASE=luminous py.test -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-update.ini b/tox-update.ini index 53e92693e..20ff37d6d 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -57,8 +57,8 @@ commands= delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel} \ - 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-jewel} \ copy_admin_key={env:COPY_ADMIN_KEY:False} \ mds_max_mds=1 \ @@ -71,9 +71,6 @@ commands= 'cluster': 'test', \ 'fetch_directory': '{env:FETCH_DIRECTORY:{changedir}/fetch}', \ 'ceph_stable_release': '{env:UPDATE_CEPH_STABLE_RELEASE:luminous}', \ - '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-luminous}', \ 'devices': [/dev/sda,/dev/sdb], \ 'dedicated_devices': [/dev/sdc,/dev/sdc], \ 'osd_scenario': 'non-collocated' \}" diff --git a/tox.ini b/tox.ini index cd77e049e..309e64788 100644 --- a/tox.ini +++ b/tox.ini @@ -45,20 +45,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-luminous} \ - " + 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:luminous} \ 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-luminous} \ " # re-setup lvm @@ -68,9 +61,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:luminous} \ 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-luminous} \ " # test that the cluster can be redeployed in a healthy state py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -83,9 +73,6 @@ commands= remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ 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-luminous} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml @@ -94,9 +81,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ 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-luminous} \ " # test that the cluster can be redeployed in a healthy state py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -113,9 +97,6 @@ commands= commands= cp {toxinidir}/infrastructure-playbooks/shrink-osd.yml {toxinidir}/shrink-osd.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-osd.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-luminous} \ ireallymeanit=yes \ osd_to_kill=0 \ " @@ -136,9 +117,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/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-luminous} \ " py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-switch-to-containers --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -153,9 +131,6 @@ commands= ireallymeanit=yes \ 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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests @@ -172,12 +147,9 @@ commands= ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " - 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" 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' @@ -220,7 +192,7 @@ setenv= shrink_mon: MON_TO_KILL = mon2 shrink_osd: COPY_ADMIN_KEY = True shrink_osd_legacy: COPY_ADMIN_KEY = True - ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.2.5-stable-3.2-luminous-centos-7 + ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.2.14-stable-3.2-luminous-centos-7-x86_64 CEPH_STABLE_RELEASE = luminous deps= -r{toxinidir}/tests/requirements.txt @@ -259,9 +231,6 @@ 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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ copy_admin_key={env:COPY_ADMIN_KEY:False} \ " @@ -278,7 +247,7 @@ commands= all_daemons: py.test -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: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_BIS:latest-bis-luminous} copy_admin_key={env:COPY_ADMIN_KEY:False} " --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:luminous} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-luminous} copy_admin_key={env:COPY_ADMIN_KEY:False} " --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands}