ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 bcaf8cedee)
pull/4820/head
Guillaume Abrioux 2019-10-08 17:23:08 +02:00
parent 91fbf79d03
commit 7e56576a38
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tox-update.ini
View File

@ -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
vagrant destroy --force

20
tox.ini
View File

@ -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