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 89828c5963079bb369a08d7351e6954b1ded27d4..229b345d6222b80089f2968f1651362fc7d2f487 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
 

diff --git a/tox.ini b/tox.ini
index 1c80ce8ba1a546b107c88ecac9547b71deaeb51d..3e9796f8200cac53af131858f250e19c4c4f388a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-envlist = {luminous,mimic,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge}
-  {luminous,mimic,rhcs}-{centos,ubuntu}-non_container-switch_to_containers
-  {luminous,mimic,rhcs}-{centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create}
+envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge}
+  {centos,ubuntu}-non_container-switch_to_containers
+  {centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create}
   infra_lv_create
 
 skipsdist = True
@@ -202,10 +202,8 @@ setenv=
   non_container: PLAYBOOK = site.yml.sample
   shrink_mon: MON_TO_KILL = mon2
   shrink_osd: COPY_ADMIN_KEY = True
-  rhcs: CEPH_STABLE_RELEASE = luminous
-  lvm_osds: CEPH_STABLE_RELEASE = luminous
-  rhcs: CEPH_STABLE_RELEASE = luminous
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.2.5-stable-3.2-luminous-centos-7
+  CEPH_STABLE_RELEASE = luminous
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=