From ab857d8b54f9a70fe6e886984410181b8e964c02 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 24 Mar 2021 15:43:25 +0100 Subject: [PATCH] tests: use master build for iscsigws pacific builds for iscsi pkgs aren't available, as a workaround we can use builds from master. Signed-off-by: Guillaume Abrioux --- tests/functional/all-in-one/group_vars/all | 1 + tests/functional/all_daemons/group_vars/all | 1 + tests/functional/all_daemons/group_vars/iscsigws | 3 +++ tests/functional/collocation/group_vars/all | 1 + tox-update.ini | 1 - tox.ini | 4 +--- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all index 0eef25098..0e54a6553 100644 --- a/tests/functional/all-in-one/group_vars/all +++ b/tests/functional/all-in-one/group_vars/all @@ -2,6 +2,7 @@ containerized_deployment: False ceph_origin: repository ceph_repository: community +ceph_dev_branch: pacific monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_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 fac681d21..c7d6e7f69 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -1,6 +1,7 @@ --- 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_distribution == 'CentOS' else 'ens6' }}" diff --git a/tests/functional/all_daemons/group_vars/iscsigws b/tests/functional/all_daemons/group_vars/iscsigws index 8d0932ab4..cd2fe5c58 100644 --- a/tests/functional/all_daemons/group_vars/iscsigws +++ b/tests/functional/all_daemons/group_vars/iscsigws @@ -1,2 +1,5 @@ --- generate_crt: True +ceph_dev_branch: master +ceph_origin: repository +ceph_repository: dev \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index 143f4f0fb..5b31bcdda 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -2,6 +2,7 @@ containerized_deployment: False ceph_origin: repository ceph_repository: community +ceph_dev_branch: pacific monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" ceph_mon_docker_subnet: "{{ public_network }}" diff --git a/tox-update.ini b/tox-update.ini index ff72fd73a..7a739f0d1 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -62,7 +62,6 @@ commands= 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_branch=pacific \ ceph_dev_sha1=latest \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ diff --git a/tox.ini b/tox.ini index 5156885a3..a0decac61 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,6 @@ 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_branch=pacific \ ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ @@ -346,7 +345,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ deploy_secondary_zones=False \ - ceph_dev_branch=pacific \ ceph_dev_sha1=latest \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ @@ -363,7 +361,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_branch=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_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands}