From c8e3be6faed1c062826117bc1355b7b752c01bd4 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 8 Aug 2017 11:41:15 -0500 Subject: [PATCH] ceph-volume: create a centos7 factor for functional testing We want to run these tests on multiple distros so this change sets the foundation for that. Signed-off-by: Andrew Schoen --- .../ceph_volume/tests/functional/centos7/create/Vagrantfile | 1 + .../tests/functional/{ => centos7}/create/group_vars/all | 0 .../ceph_volume/tests/functional/{ => centos7}/create/hosts | 0 .../functional/{ => centos7}/create/vagrant_variables.yml | 0 .../ceph_volume/tests/functional/create/Vagrantfile | 1 - src/ceph-volume/ceph_volume/tests/functional/tox.ini | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile rename src/ceph-volume/ceph_volume/tests/functional/{ => centos7}/create/group_vars/all (100%) rename src/ceph-volume/ceph_volume/tests/functional/{ => centos7}/create/hosts (100%) rename src/ceph-volume/ceph_volume/tests/functional/{ => centos7}/create/vagrant_variables.yml (100%) delete mode 120000 src/ceph-volume/ceph_volume/tests/functional/create/Vagrantfile diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile new file mode 120000 index 0000000000000..2572fa2c9f694 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile @@ -0,0 +1 @@ +../../Vagrantfile \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/group_vars/all similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/create/group_vars/all rename to src/ceph-volume/ceph_volume/tests/functional/centos7/create/group_vars/all diff --git a/src/ceph-volume/ceph_volume/tests/functional/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/hosts similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/create/hosts rename to src/ceph-volume/ceph_volume/tests/functional/centos7/create/hosts diff --git a/src/ceph-volume/ceph_volume/tests/functional/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/create/vagrant_variables.yml rename to src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/create/Vagrantfile deleted file mode 120000 index 739836227ee9c..0000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/create/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../Vagrantfile \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/tox.ini index ce1f51040e8dc..adb3e1ad20967 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {create,prepare_activate} +envlist = {centos7}-{create,prepare_activate} skipsdist = True [testenv] @@ -18,7 +18,7 @@ deps= testinfra==1.6.0 pytest-xdist changedir= - create: {toxinidir}/create + centos7-create: {toxinidir}/centos7/create prepare_activate: {toxinidir}/prepare_activate commands= git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible -- 2.39.5