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 <gabrioux@redhat.com>

diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all
index 0eef250985ef69e33053b57c4f935f672d5d3bde..0e54a6553540e1057d843f1a16236f3a069d6816 100644 (file)
--- 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 fac681d21cc33c2a7b856837beafc586a1caad11..c7d6e7f6984d6d1fbc008d43df04f3a2fabd0f35 100644 (file)
--- 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 8d0932ab41c4b3f1887d7b499b7a48937b707b43..cd2fe5c5857a217a10ac5718a7257b9056d48f4b 100644 (file)
--- 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 143f4f0fb94b89ab117965b619232582d4bffb2b..5b31bcdda291cbb4cd8688b60e0bbb87b8000e6c 100644 (file)
--- 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 ff72fd73a1b8d80b776e9ae7ad953b776f24dcd8..7a739f0d1466eb946e1721bde453e51f30845517 100644 (file)
--- 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 5156885a34dc0b4f7a57b6ca7ed05de11b1f88ad..a0decac61a935cd20a111fb318df28c43d532150 100644 (file)
--- 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}