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/4576/head
Guillaume Abrioux 2019-10-08 17:23:08 +02:00 committed by Dimitri Savineau
parent 5f91be8740
commit 4e42d085f7
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox-podman.ini
View File

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

2
tox-update.ini
View File

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

20
tox.ini
View File

@ -1,7 +1,7 @@
[tox] [tox]
envlist = {nautilus,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} 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}
{nautilus,rhcs}-{centos,ubuntu}-container-{ooo_collocation} {centos,ubuntu}-container-{ooo_collocation}
{nautilus,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers} {centos,ubuntu}-non_container-{switch_to_containers}
infra_lv_create infra_lv_create
migrate_ceph_disk_to_ceph_volume migrate_ceph_disk_to_ceph_volume
@ -380,14 +380,12 @@ setenv=
shrink_mon: MON_TO_KILL = mon2 shrink_mon: MON_TO_KILL = mon2
shrink_mgr: MGR_TO_KILL = mgr1 shrink_mgr: MGR_TO_KILL = mgr1
rhcs: CEPH_STABLE_RELEASE = luminous
lvm_osds: CEPH_STABLE_RELEASE = nautilus lvm_osds: CEPH_STABLE_RELEASE = nautilus
rhcs: CEPH_STABLE_RELEASE = luminous CEPH_DOCKER_IMAGE_TAG = latest-nautilus
nautilus: CEPH_DOCKER_IMAGE_TAG = latest-nautilus CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus
nautilus: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
nautilus: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus CEPH_STABLE_RELEASE = nautilus
nautilus: CEPH_STABLE_RELEASE = nautilus
ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64 ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
deps= -r{toxinidir}/tests/requirements.txt deps= -r{toxinidir}/tests/requirements.txt
@ -419,16 +417,12 @@ changedir=
lvm_auto_discovery: {toxinidir}/tests/functional/lvm-auto-discovery{env:CONTAINER_DIR:} lvm_auto_discovery: {toxinidir}/tests/functional/lvm-auto-discovery{env:CONTAINER_DIR:}
commands= commands=
rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
vagrant up --no-provision {posargs:--provider=virtualbox} vagrant up --no-provision {posargs:--provider=virtualbox}
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
# configure lvm # configure lvm
!lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\