From: Dimitri Savineau Date: Tue, 29 Jun 2021 15:59:20 +0000 (-0400) Subject: tox: remove ceph_dev variables and dev_setup calls X-Git-Tag: v6.0.12~34 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a71a80c16778749c360c6a384ae43730bc941b35;p=ceph-ansible.git tox: remove ceph_dev variables and dev_setup calls Since pacific is a stable release then we don't need to use shaman for getting the pacific build. Signed-off-by: Dimitri Savineau --- diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all index a51d5b28f..f50a1bba0 100644 --- a/tests/functional/all-in-one/group_vars/all +++ b/tests/functional/all-in-one/group_vars/all @@ -2,7 +2,6 @@ containerized_deployment: False ceph_origin: repository ceph_repository: community -ceph_dev_branch: pacific monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" ceph_mon_docker_subnet: "{{ public_network }}" diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index e1e8b0e9a..69e021238 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -1,7 +1,6 @@ --- ceph_origin: repository ceph_repository: community -ceph_dev_branch: pacific public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" diff --git a/tests/functional/all_daemons/group_vars/iscsigws b/tests/functional/all_daemons/group_vars/iscsigws index cd2fe5c58..d70049a23 100644 --- a/tests/functional/all_daemons/group_vars/iscsigws +++ b/tests/functional/all_daemons/group_vars/iscsigws @@ -1,5 +1,2 @@ --- -generate_crt: True -ceph_dev_branch: master -ceph_origin: repository -ceph_repository: dev \ No newline at end of file +generate_crt: True \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index f68dc95ee..1b4f7b810 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -2,7 +2,6 @@ containerized_deployment: False ceph_origin: repository ceph_repository: community -ceph_dev_branch: pacific monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" ceph_mon_docker_subnet: "{{ public_network }}" diff --git a/tox-external_clients.ini b/tox-external_clients.ini index 188e0c721..687f2cf94 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -26,6 +26,7 @@ setenv= container: CONTAINER_DIR = /container container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample + non_container: CEPH_STABLE_RELEASE = pacific deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/external_clients{env:CONTAINER_DIR:} @@ -38,11 +39,9 @@ commands= # configure lvm ansible-playbook -vv -i {changedir}/inventory/hosts {toxinidir}/tests/functional/lvm_setup.yml - non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=pacififc ceph_dev_sha1=latest" --tags "vagrant_setup" ansible-playbook -vv -i {changedir}/inventory/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit 'all:!clients' --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -55,27 +54,25 @@ commands= fsid=40358a87-ab6e-4bdc-83db-1d909147861c \ external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \ generate_fsid=false \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf + bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:pacific} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" ansible-playbook -vv -i {changedir}/inventory/external_clients-hosts {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ fsid=40358a87-ab6e-4bdc-83db-1d909147861c \ external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \ generate_fsid=false \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf + bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:pacific} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" vagrant destroy --force diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index c964af403..a785bcddd 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -41,28 +41,22 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml - ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=pacific ceph_dev_sha1=latest" --tags "vagrant_setup" - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd0:osd1' ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd3:osd4' --tags partitions # deploy the cluster ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_stable_release=pacific \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ 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}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/filestore-to-bluestore.yml --limit osds --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_stable_release=pacific \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ " - bash -c "CEPH_STABLE_RELEASE=pacific 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" + bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:pacific} 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" vagrant destroy --force diff --git a/tox-podman.ini b/tox-podman.ini index 9e0787c1c..3f9644aea 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -26,7 +26,6 @@ setenv= # Set the ansible inventory host file to be used according to which distrib we are running on INVENTORY = {env:_INVENTORY:hosts} PLAYBOOK = site-container.yml.sample - CEPH_STABLE_RELEASE = nautilus deps= -r{toxinidir}/tests/requirements.txt changedir= {toxinidir}/tests/functional/podman diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini index 1e9c76010..a8fa7300c 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -81,8 +81,6 @@ changedir= commands= - ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=pacific ceph_dev_sha1=latest" --tags "vagrant_setup" - bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} @@ -93,8 +91,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -110,8 +107,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit osds --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_dev_branch=pacific \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ 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 19460c610..ef9541fe2 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -28,9 +28,10 @@ setenv= container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-bis-pacific - UPDATE_CEPH_DEV_BRANCH = pacific - UPDATE_CEPH_DEV_SHA1 = latest + CEPH_DOCKER_IMAGE_TAG = latest-octopus + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific + CEPH_STABLE_RELEASE = octopus + UPDATE_CEPH_STABLE_RELEASE = pacific ROLLING_UPDATE = True deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} @@ -52,10 +53,10 @@ 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_stable_release=octopus \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \ - ceph_docker_image_tag=latest-octopus \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -65,10 +66,9 @@ commands= ceph_nfs_rgw_secret_key=fake_secret_key \ "' - non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=pacific ceph_dev_sha1=latest setup_nfs_dev_repo=false" --tags "vagrant_setup" ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -76,6 +76,6 @@ commands= nfs_obj_gw=False \ " - bash -c "CEPH_STABLE_RELEASE=pacific 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" + bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:pacific} 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" vagrant destroy --force diff --git a/tox.ini b/tox.ini index a0decac61..eab18d582 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,7 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -83,8 +83,7 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ " # 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 @@ -134,6 +133,7 @@ commands= 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_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_image_tag=latest-pacific-devel \ ceph_docker_registry=quay.ceph.io \ ceph_docker_image=ceph-ci/daemon \ @@ -153,8 +153,7 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mon1 {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ " 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 @@ -163,8 +162,7 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -176,8 +174,7 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -189,8 +186,7 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -202,8 +198,7 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -215,22 +210,19 @@ commands= bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}" bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}/secondary" 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/setup.yml - ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir}/secondary ceph_dev_branch=pacific ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" 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/lvm_setup.yml # ensure the rule isn't already present 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' 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=present' 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}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ 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}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit rgws --extra-vars "\ - ceph_dev_branch=pacific \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -330,7 +322,6 @@ changedir= commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup" - ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch=pacific ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} @@ -345,7 +336,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ deploy_secondary_zones=False \ - ceph_dev_sha1=latest \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -361,7 +352,7 @@ commands= all_daemons,collocation: py.test --reruns 20 --reruns-delay 3 -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,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-pacific} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json + all_daemons,all_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-pacific} ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific}" --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands}