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/4586/head
Guillaume Abrioux 2019-10-08 17:23:08 +02:00 committed by Dimitri Savineau
parent 2d40e3923f
commit 6e976c197c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox-update.ini
View File

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

10
tox.ini
View File

@ -1,7 +1,7 @@
[tox] [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} envlist = {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 {centos,ubuntu}-non_container-switch_to_containers
{luminous,mimic,rhcs}-{centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create} {centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create}
infra_lv_create infra_lv_create
skipsdist = True skipsdist = True
@ -202,10 +202,8 @@ setenv=
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
shrink_mon: MON_TO_KILL = mon2 shrink_mon: MON_TO_KILL = mon2
shrink_osd: COPY_ADMIN_KEY = True 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 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 deps= -r{toxinidir}/tests/requirements.txt
changedir= changedir=