tests: update tox due to pipeline removal

This commit reflects the recent changes in ceph/ceph-build#1406

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit bcaf8cedeec0f06eb8641b0038569a5cd3a3e7be)

diff --git a/tox-update.ini b/tox-update.ini
index 105d7244b963e47ebe516117a4ea5a346c5f0cac..1d46f77b37cc9eee05d0bf3f1b15ecd3b4019300 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = luminous-{centos,ubuntu}-{container,non_container}-update
+envlist = {centos,ubuntu}-{container,non_container}-update
 
 skipsdist = True
 
@@ -76,4 +76,4 @@ commands=
 
   bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:luminous} ROLLING_UPDATE=TRUE py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests"
 
-  vagrant destroy --force
\ No newline at end of file
+  vagrant destroy --force

diff --git a/tox.ini b/tox.ini
index fe60387959355bcba0821a7f2af8dd425ec65b8f..3517cfe7845a7dd58d0c7b6c1962e73aea2320f2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-envlist = {jewel,luminous,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,cluster,filestore_osds,purge_filestore,purge,ooo_collocation,shrink_mon,shrink_osd,collocation}
-  {luminous,rhcs}-{centos,ubuntu}-{container,non_container}-{bluestore_osds,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,purge_bluestore}
-  {jewel,luminous}-{centos,ubuntu}-non_container-switch_to_containers
+envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,cluster,filestore_osds,purge_filestore,purge,ooo_collocation,shrink_mon,shrink_osd,collocation}
+  {centos,ubuntu}-{container,non_container}-{bluestore_osds,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,purge_bluestore}
+  {centos,ubuntu}-non_container-switch_to_containers
   infra_lv_create
 
 skipsdist = True
@@ -165,13 +165,13 @@ setenv=
   container: PURGE_PLAYBOOK = purge-docker-cluster.yml
   shrink_osd: COPY_ADMIN_KEY = True
 
-  rhcs: CEPH_STABLE_RELEASE = luminous
-  jewel: CEPH_STABLE_RELEASE = jewel
-  jewel: CEPH_DOCKER_IMAGE_TAG = latest-jewel
-  jewel: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-jewel
-  luminous: CEPH_STABLE_RELEASE = luminous
-  luminous: CEPH_DOCKER_IMAGE_TAG = latest-luminous
-  luminous: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-luminous
+  CEPH_STABLE_RELEASE = luminous
+  CEPH_STABLE_RELEASE = jewel
+  CEPH_DOCKER_IMAGE_TAG = latest-jewel
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-jewel
+  CEPH_STABLE_RELEASE = luminous
+  CEPH_DOCKER_IMAGE_TAG = latest-luminous
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-luminous
   lvm_osds: CEPH_STABLE_RELEASE = luminous
   bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous
 deps= -r{toxinidir}/tests/requirements.txt