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>
pull/4575/head
Guillaume Abrioux 2019-10-08 17:23:08 +02:00
parent 19edf707a5
commit bcaf8cedee
3 changed files with 11 additions and 13 deletions

View File

@ -1,5 +1,5 @@
[tox]
envlist = dev-centos-container-podman
envlist = centos-container-podman
skipsdist = True

View File

@ -1,5 +1,5 @@
[tox]
envlist = dev-{centos,ubuntu}-{container,non_container}-update
envlist = {centos,ubuntu}-{container,non_container}-update
skipsdist = True

20
tox.ini
View File

@ -1,7 +1,7 @@
[tox]
envlist = {dev,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
{dev,rhcs}-{centos,ubuntu}-container-{ooo_collocation}
{dev,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers}
envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
{centos,ubuntu}-container-{ooo_collocation}
{centos,ubuntu}-non_container-{switch_to_containers}
infra_lv_create
migrate_ceph_disk_to_ceph_volume
@ -393,16 +393,14 @@ setenv=
shrink_mon: MON_TO_KILL = mon2
shrink_mgr: MGR_TO_KILL = mgr1
rhcs: CEPH_STABLE_RELEASE = luminous
lvm_osds: CEPH_STABLE_RELEASE = luminous
rhcs: CEPH_STABLE_RELEASE = luminous
dev: CEPH_DOCKER_IMAGE_TAG = latest-master
dev: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master
dev: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
dev: UPDATE_CEPH_DEV_BRANCH = master
dev: UPDATE_CEPH_DEV_SHA1 = latest
dev: CEPH_STABLE_RELEASE = nautilus
CEPH_DOCKER_IMAGE_TAG = latest-master
CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master
UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
UPDATE_CEPH_DEV_BRANCH = master
UPDATE_CEPH_DEV_SHA1 = latest
CEPH_STABLE_RELEASE = nautilus
switch_to_containers: CEPH_STABLE_RELEASE = octopus
switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel