tests: uninstall ansible prior to install 6.0 req

in order to avoid conflict with previous version installed

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 3762181bb1b4c2b43556881758c25f88b4891e4d..976f979d231d07de98141c16ce49f1f6d1102cb1 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -54,6 +54,7 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "'
 
+  pip uninstall -y ansible
   pip install -r {toxinidir}/tests/requirements.txt
 # upgrade mons
 # mon1

diff --git a/tox-update.ini b/tox-update.ini
index 24669b295b17c8f94c3f376caf10550c259f949e..a1d9b12f55027ac2774a60060d79054c416f9a93 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -61,6 +61,7 @@ commands=
       ceph_nfs_rgw_access_key=fake_access_key \
       ceph_nfs_rgw_secret_key=fake_secret_key \
   "'
+  pip uninstall -y ansible
   pip install -r {toxinidir}/tests/requirements.txt
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \