From f16841e09e88a89c9c0b3f3b68f45fd992e07d07 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 7 Jul 2017 18:30:06 +0200 Subject: [PATCH] Tests: rename tests directories Since we are hitting this bug : https://bugzilla.redhat.com/show_bug.cgi?id=1324587 eg: `failed: internal error: Monitor path /var/lib/libvirt/qemu/domain-bs-docker-cl uster-dmcrypt-journal-collocation_mon0_1499294943_ba9faf7bf296533177f6/monitor. sock too big for destination` and we can't upgrade libvirt in our CI for some reason we need to get the directories name shorter in order to workaround this issue Signed-off-by: Guillaume Abrioux --- .../7/{bs-cluster => bluestore}/Vagrantfile | 0 .../{bs-cluster => bluestore}/group_vars/all | 0 .../{bs-cluster => bluestore}/group_vars/osds | 0 .../{bs-cluster => bluestore}/group_vars/rgws | 0 .../centos/7/{bs-cluster => bluestore}/hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../7/{bs-docker-cluster => bs-docker}/hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../hosts | 0 .../vagrant_variables.yml | 0 .../7/{docker-cluster => docker}/Vagrantfile | 0 .../{docker-cluster => docker}/group_vars/all | 0 .../centos/7/{docker-cluster => docker}/hosts | 0 .../vagrant_variables.yml | 0 .../Vagrantfile | 0 .../group_vars/all | 0 .../group_vars/osds | 0 .../7/{journal-collocation => jrn-col}/hosts | 0 .../vagrant_variables.yml | 0 tox.ini | 34 +++++++++---------- 62 files changed, 17 insertions(+), 17 deletions(-) rename tests/functional/centos/7/{bs-cluster => bluestore}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-cluster => bluestore}/group_vars/all (100%) rename tests/functional/centos/7/{bs-cluster => bluestore}/group_vars/osds (100%) rename tests/functional/centos/7/{bs-cluster => bluestore}/group_vars/rgws (100%) rename tests/functional/centos/7/{bs-cluster => bluestore}/hosts (100%) rename tests/functional/centos/7/{bs-cluster => bluestore}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-dmcrypt-dedicated-journal => bs-crypt-ded-jrn}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-dmcrypt-dedicated-journal => bs-crypt-ded-jrn}/group_vars/all (100%) rename tests/functional/centos/7/{bs-dmcrypt-dedicated-journal => bs-crypt-ded-jrn}/group_vars/osds (100%) rename tests/functional/centos/7/{bs-dmcrypt-dedicated-journal => bs-crypt-ded-jrn}/hosts (100%) rename tests/functional/centos/7/{bs-dmcrypt-dedicated-journal => bs-crypt-ded-jrn}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-dmcrypt-journal-colloc => bs-crypt-jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-dmcrypt-journal-colloc => bs-crypt-jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{bs-dmcrypt-journal-colloc => bs-crypt-jrn-col}/group_vars/osds (100%) rename tests/functional/centos/7/{bs-dmcrypt-journal-colloc => bs-crypt-jrn-col}/hosts (100%) rename tests/functional/centos/7/{bs-dmcrypt-journal-colloc => bs-crypt-jrn-col}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-docker-cluster-dedicated-journal => bs-dock-crypt-jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-docker-dmcrypt-journal-colloc => bs-dock-crypt-jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{bs-docker-dmcrypt-journal-colloc => bs-dock-crypt-jrn-col}/group_vars/osds (100%) rename tests/functional/centos/7/{bs-docker-cluster-dedicated-journal => bs-dock-crypt-jrn-col}/hosts (100%) rename tests/functional/centos/7/{bs-docker-dmcrypt-journal-colloc => bs-dock-crypt-jrn-col}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-docker-cluster => bs-dock-ded-jrn}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-docker-cluster-dedicated-journal => bs-dock-ded-jrn}/group_vars/all (100%) rename tests/functional/centos/7/{bs-docker-dmcrypt-journal-colloc => bs-dock-ded-jrn}/hosts (100%) rename tests/functional/centos/7/{bs-docker-cluster-dedicated-journal => bs-dock-ded-jrn}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-docker-dmcrypt-journal-colloc => bs-docker}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-docker-cluster => bs-docker}/group_vars/all (100%) rename tests/functional/centos/7/{bs-docker-cluster => bs-docker}/hosts (100%) rename tests/functional/centos/7/{bs-docker-cluster => bs-docker}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{bs-journal-collocation => bs-jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{bs-journal-collocation => bs-jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{bs-journal-collocation => bs-jrn-col}/group_vars/osds (100%) rename tests/functional/centos/7/{bs-journal-collocation => bs-jrn-col}/hosts (100%) rename tests/functional/centos/7/{bs-journal-collocation => bs-jrn-col}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{dmcrypt-dedicated-journal => crypt-ded-jrn}/Vagrantfile (100%) rename tests/functional/centos/7/{dmcrypt-dedicated-journal => crypt-ded-jrn}/group_vars/all (100%) rename tests/functional/centos/7/{dmcrypt-dedicated-journal => crypt-ded-jrn}/group_vars/osds (100%) rename tests/functional/centos/7/{dmcrypt-dedicated-journal => crypt-ded-jrn}/hosts (100%) rename tests/functional/centos/7/{dmcrypt-dedicated-journal => crypt-ded-jrn}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{dmcrypt-journal-collocation => crypt-jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{dmcrypt-journal-collocation => crypt-jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{dmcrypt-journal-collocation => crypt-jrn-col}/group_vars/osds (100%) rename tests/functional/centos/7/{dmcrypt-journal-collocation => crypt-jrn-col}/hosts (100%) rename tests/functional/centos/7/{dmcrypt-journal-collocation => crypt-jrn-col}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{docker-cluster-dedicated-journal => docker-crypt-jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{docker-cluster-dmcrypt-journal-collocation => docker-crypt-jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{docker-cluster-dedicated-journal => docker-crypt-jrn-col}/hosts (100%) rename tests/functional/centos/7/{docker-cluster-dedicated-journal => docker-crypt-jrn-col}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{docker-cluster-dmcrypt-journal-collocation => docker-ded-jrn}/Vagrantfile (100%) rename tests/functional/centos/7/{docker-cluster-dedicated-journal => docker-ded-jrn}/group_vars/all (100%) rename tests/functional/centos/7/{docker-cluster-dmcrypt-journal-collocation => docker-ded-jrn}/hosts (100%) rename tests/functional/centos/7/{docker-cluster-dmcrypt-journal-collocation => docker-ded-jrn}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{docker-cluster => docker}/Vagrantfile (100%) rename tests/functional/centos/7/{docker-cluster => docker}/group_vars/all (100%) rename tests/functional/centos/7/{docker-cluster => docker}/hosts (100%) rename tests/functional/centos/7/{docker-cluster => docker}/vagrant_variables.yml (100%) rename tests/functional/centos/7/{journal-collocation => jrn-col}/Vagrantfile (100%) rename tests/functional/centos/7/{journal-collocation => jrn-col}/group_vars/all (100%) rename tests/functional/centos/7/{journal-collocation => jrn-col}/group_vars/osds (100%) rename tests/functional/centos/7/{journal-collocation => jrn-col}/hosts (100%) rename tests/functional/centos/7/{journal-collocation => jrn-col}/vagrant_variables.yml (100%) diff --git a/tests/functional/centos/7/bs-cluster/Vagrantfile b/tests/functional/centos/7/bluestore/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-cluster/Vagrantfile rename to tests/functional/centos/7/bluestore/Vagrantfile diff --git a/tests/functional/centos/7/bs-cluster/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-cluster/group_vars/all rename to tests/functional/centos/7/bluestore/group_vars/all diff --git a/tests/functional/centos/7/bs-cluster/group_vars/osds b/tests/functional/centos/7/bluestore/group_vars/osds similarity index 100% rename from tests/functional/centos/7/bs-cluster/group_vars/osds rename to tests/functional/centos/7/bluestore/group_vars/osds diff --git a/tests/functional/centos/7/bs-cluster/group_vars/rgws b/tests/functional/centos/7/bluestore/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/bs-cluster/group_vars/rgws rename to tests/functional/centos/7/bluestore/group_vars/rgws diff --git a/tests/functional/centos/7/bs-cluster/hosts b/tests/functional/centos/7/bluestore/hosts similarity index 100% rename from tests/functional/centos/7/bs-cluster/hosts rename to tests/functional/centos/7/bluestore/hosts diff --git a/tests/functional/centos/7/bs-cluster/vagrant_variables.yml b/tests/functional/centos/7/bluestore/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-cluster/vagrant_variables.yml rename to tests/functional/centos/7/bluestore/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/Vagrantfile b/tests/functional/centos/7/bs-crypt-ded-jrn/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-dedicated-journal/Vagrantfile rename to tests/functional/centos/7/bs-crypt-ded-jrn/Vagrantfile diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/all rename to tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/osds b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/osds similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/osds rename to tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/osds diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/hosts b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-dedicated-journal/hosts rename to tests/functional/centos/7/bs-crypt-ded-jrn/hosts diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/bs-crypt-ded-jrn/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-dedicated-journal/vagrant_variables.yml rename to tests/functional/centos/7/bs-crypt-ded-jrn/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/Vagrantfile b/tests/functional/centos/7/bs-crypt-jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-journal-colloc/Vagrantfile rename to tests/functional/centos/7/bs-crypt-jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/all b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/all rename to tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/osds b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/osds similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/osds rename to tests/functional/centos/7/bs-crypt-jrn-col/group_vars/osds diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/hosts b/tests/functional/centos/7/bs-crypt-jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-journal-colloc/hosts rename to tests/functional/centos/7/bs-crypt-jrn-col/hosts diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/vagrant_variables.yml b/tests/functional/centos/7/bs-crypt-jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-dmcrypt-journal-colloc/vagrant_variables.yml rename to tests/functional/centos/7/bs-crypt-jrn-col/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/Vagrantfile b/tests/functional/centos/7/bs-dock-crypt-jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster-dedicated-journal/Vagrantfile rename to tests/functional/centos/7/bs-dock-crypt-jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/all b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/all rename to tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/osds b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/osds similarity index 100% rename from tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/osds rename to tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/osds diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/hosts b/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster-dedicated-journal/hosts rename to tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/vagrant_variables.yml b/tests/functional/centos/7/bs-dock-crypt-jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/vagrant_variables.yml rename to tests/functional/centos/7/bs-dock-crypt-jrn-col/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-docker-cluster/Vagrantfile b/tests/functional/centos/7/bs-dock-ded-jrn/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster/Vagrantfile rename to tests/functional/centos/7/bs-dock-ded-jrn/Vagrantfile diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/group_vars/all b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster-dedicated-journal/group_vars/all rename to tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/hosts b/tests/functional/centos/7/bs-dock-ded-jrn/hosts similarity index 100% rename from tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/hosts rename to tests/functional/centos/7/bs-dock-ded-jrn/hosts diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/bs-dock-ded-jrn/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster-dedicated-journal/vagrant_variables.yml rename to tests/functional/centos/7/bs-dock-ded-jrn/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/Vagrantfile b/tests/functional/centos/7/bs-docker/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/Vagrantfile rename to tests/functional/centos/7/bs-docker/Vagrantfile diff --git a/tests/functional/centos/7/bs-docker-cluster/group_vars/all b/tests/functional/centos/7/bs-docker/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster/group_vars/all rename to tests/functional/centos/7/bs-docker/group_vars/all diff --git a/tests/functional/centos/7/bs-docker-cluster/hosts b/tests/functional/centos/7/bs-docker/hosts similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster/hosts rename to tests/functional/centos/7/bs-docker/hosts diff --git a/tests/functional/centos/7/bs-docker-cluster/vagrant_variables.yml b/tests/functional/centos/7/bs-docker/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-docker-cluster/vagrant_variables.yml rename to tests/functional/centos/7/bs-docker/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-journal-collocation/Vagrantfile b/tests/functional/centos/7/bs-jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/bs-journal-collocation/Vagrantfile rename to tests/functional/centos/7/bs-jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/bs-journal-collocation/group_vars/all b/tests/functional/centos/7/bs-jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-journal-collocation/group_vars/all rename to tests/functional/centos/7/bs-jrn-col/group_vars/all diff --git a/tests/functional/centos/7/bs-journal-collocation/group_vars/osds b/tests/functional/centos/7/bs-jrn-col/group_vars/osds similarity index 100% rename from tests/functional/centos/7/bs-journal-collocation/group_vars/osds rename to tests/functional/centos/7/bs-jrn-col/group_vars/osds diff --git a/tests/functional/centos/7/bs-journal-collocation/hosts b/tests/functional/centos/7/bs-jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/bs-journal-collocation/hosts rename to tests/functional/centos/7/bs-jrn-col/hosts diff --git a/tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/bs-jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml rename to tests/functional/centos/7/bs-jrn-col/vagrant_variables.yml diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/Vagrantfile b/tests/functional/centos/7/crypt-ded-jrn/Vagrantfile similarity index 100% rename from tests/functional/centos/7/dmcrypt-dedicated-journal/Vagrantfile rename to tests/functional/centos/7/crypt-ded-jrn/Vagrantfile diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all similarity index 100% rename from tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all rename to tests/functional/centos/7/crypt-ded-jrn/group_vars/all diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/osds b/tests/functional/centos/7/crypt-ded-jrn/group_vars/osds similarity index 100% rename from tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/osds rename to tests/functional/centos/7/crypt-ded-jrn/group_vars/osds diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts b/tests/functional/centos/7/crypt-ded-jrn/hosts similarity index 100% rename from tests/functional/centos/7/dmcrypt-dedicated-journal/hosts rename to tests/functional/centos/7/crypt-ded-jrn/hosts diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/dmcrypt-dedicated-journal/vagrant_variables.yml rename to tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/Vagrantfile b/tests/functional/centos/7/crypt-jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/dmcrypt-journal-collocation/Vagrantfile rename to tests/functional/centos/7/crypt-jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/crypt-jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all rename to tests/functional/centos/7/crypt-jrn-col/group_vars/all diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/osds b/tests/functional/centos/7/crypt-jrn-col/group_vars/osds similarity index 100% rename from tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/osds rename to tests/functional/centos/7/crypt-jrn-col/group_vars/osds diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/hosts b/tests/functional/centos/7/crypt-jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/dmcrypt-journal-collocation/hosts rename to tests/functional/centos/7/crypt-jrn-col/hosts diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/dmcrypt-journal-collocation/vagrant_variables.yml rename to tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile b/tests/functional/centos/7/docker-crypt-jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile rename to tests/functional/centos/7/docker-crypt-jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all rename to tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/hosts b/tests/functional/centos/7/docker-crypt-jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/docker-cluster-dedicated-journal/hosts rename to tests/functional/centos/7/docker-crypt-jrn-col/hosts diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml rename to tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile b/tests/functional/centos/7/docker-ded-jrn/Vagrantfile similarity index 100% rename from tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile rename to tests/functional/centos/7/docker-ded-jrn/Vagrantfile diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all b/tests/functional/centos/7/docker-ded-jrn/group_vars/all similarity index 100% rename from tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all rename to tests/functional/centos/7/docker-ded-jrn/group_vars/all diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/hosts b/tests/functional/centos/7/docker-ded-jrn/hosts similarity index 100% rename from tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/hosts rename to tests/functional/centos/7/docker-ded-jrn/hosts diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/vagrant_variables.yml rename to tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml diff --git a/tests/functional/centos/7/docker-cluster/Vagrantfile b/tests/functional/centos/7/docker/Vagrantfile similarity index 100% rename from tests/functional/centos/7/docker-cluster/Vagrantfile rename to tests/functional/centos/7/docker/Vagrantfile diff --git a/tests/functional/centos/7/docker-cluster/group_vars/all b/tests/functional/centos/7/docker/group_vars/all similarity index 100% rename from tests/functional/centos/7/docker-cluster/group_vars/all rename to tests/functional/centos/7/docker/group_vars/all diff --git a/tests/functional/centos/7/docker-cluster/hosts b/tests/functional/centos/7/docker/hosts similarity index 100% rename from tests/functional/centos/7/docker-cluster/hosts rename to tests/functional/centos/7/docker/hosts diff --git a/tests/functional/centos/7/docker-cluster/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/docker-cluster/vagrant_variables.yml rename to tests/functional/centos/7/docker/vagrant_variables.yml diff --git a/tests/functional/centos/7/journal-collocation/Vagrantfile b/tests/functional/centos/7/jrn-col/Vagrantfile similarity index 100% rename from tests/functional/centos/7/journal-collocation/Vagrantfile rename to tests/functional/centos/7/jrn-col/Vagrantfile diff --git a/tests/functional/centos/7/journal-collocation/group_vars/all b/tests/functional/centos/7/jrn-col/group_vars/all similarity index 100% rename from tests/functional/centos/7/journal-collocation/group_vars/all rename to tests/functional/centos/7/jrn-col/group_vars/all diff --git a/tests/functional/centos/7/journal-collocation/group_vars/osds b/tests/functional/centos/7/jrn-col/group_vars/osds similarity index 100% rename from tests/functional/centos/7/journal-collocation/group_vars/osds rename to tests/functional/centos/7/jrn-col/group_vars/osds diff --git a/tests/functional/centos/7/journal-collocation/hosts b/tests/functional/centos/7/jrn-col/hosts similarity index 100% rename from tests/functional/centos/7/journal-collocation/hosts rename to tests/functional/centos/7/jrn-col/hosts diff --git a/tests/functional/centos/7/journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/jrn-col/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/journal-collocation/vagrant_variables.yml rename to tests/functional/centos/7/jrn-col/vagrant_variables.yml diff --git a/tox.ini b/tox.ini index db6a35c9a..97cf03cbd 100644 --- a/tox.ini +++ b/tox.ini @@ -87,32 +87,32 @@ changedir= # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario - journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation + journal_collocation: {toxinidir}/tests/functional/centos/7/jrn-col # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario - dmcrypt_journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal + dmcrypt_journal: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario - dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation + dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/crypt-jrn-col # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster # an alias for centos7_cluster, this makes the name better suited for rhcs testing cluster: {toxinidir}/tests/functional/centos/7/cluster # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker - docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/docker-cluster-dedicated-journal - docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation + docker_cluster: {toxinidir}/tests/functional/centos/7/docker + update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker + purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker + docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/docker-ded-jrn + docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/docker-crypt-jrn-col purge_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster - purge_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal - update_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal + purge_dmcrypt: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn + update_dmcrypt: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn update_cluster: {toxinidir}/tests/functional/centos/7/cluster - bluestore_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-journal-collocation - bluestore_cluster: {toxinidir}/tests/functional/centos/7/bs-cluster - bluestore_dmcrypt_journal: {toxinidir}/tests/functional/centos/7/bs-dmcrypt-dedicated-journal - bluestore_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-dmcrypt-journal-colloc - bluestore_docker_cluster: {toxinidir}/tests/functional/centos/7/bs-docker-cluster - bluestore_docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/bs-docker-cluster-dedicated-journal - bluestore_docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc + bluestore_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-jrn-col + bluestore_cluster: {toxinidir}/tests/functional/centos/7/bluestore + bluestore_dmcrypt_journal: {toxinidir}/tests/functional/centos/7/bs-crypt-ded-jrn + bluestore_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-crypt-jrn-col + bluestore_docker_cluster: {toxinidir}/tests/functional/centos/7/bs-docker + bluestore_docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/bs-dock-ded-jrn + bluestore_docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-dock-crypt-jrn-col commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup" -- 2.39.5