From a05a1b9b0faa85097dd3267d93e25ad216234690 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 28 Nov 2016 15:02:16 -0600 Subject: [PATCH] testing: change raw-multi-journal to journal-collocation We want to test journal collocation here because we're gonna switch xenial-cluster and centos7-cluster to use a dedicated journal. Signed-off-by: Andrew Schoen --- .../{raw-multi-journal => journal-collocation}/Vagrantfile | 0 .../group_vars/all | 3 +-- .../group_vars/osds | 0 .../7/{raw-multi-journal => journal-collocation}/hosts | 0 .../{raw-multi-journal => journal-collocation}/scenario.py | 0 .../vagrant_variables.yml | 0 tox.ini | 6 +++--- 7 files changed, 4 insertions(+), 5 deletions(-) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/Vagrantfile (100%) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/group_vars/all (84%) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/group_vars/osds (100%) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/hosts (100%) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/scenario.py (100%) rename tests/functional/centos/7/{raw-multi-journal => journal-collocation}/vagrant_variables.yml (100%) diff --git a/tests/functional/centos/7/raw-multi-journal/Vagrantfile b/tests/functional/centos/7/journal-collocation/Vagrantfile similarity index 100% rename from tests/functional/centos/7/raw-multi-journal/Vagrantfile rename to tests/functional/centos/7/journal-collocation/Vagrantfile diff --git a/tests/functional/centos/7/raw-multi-journal/group_vars/all b/tests/functional/centos/7/journal-collocation/group_vars/all similarity index 84% rename from tests/functional/centos/7/raw-multi-journal/group_vars/all rename to tests/functional/centos/7/journal-collocation/group_vars/all index 335f89670..95e343693 100644 --- a/tests/functional/centos/7/raw-multi-journal/group_vars/all +++ b/tests/functional/centos/7/journal-collocation/group_vars/all @@ -6,9 +6,8 @@ cluster_network: "192.168.4.0/24" journal_size: 100 devices: - '/dev/sda' -raw_journal_devices: - '/dev/sdb' -raw_multi_journal: True +journal_collocation: True os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/raw-multi-journal/group_vars/osds b/tests/functional/centos/7/journal-collocation/group_vars/osds similarity index 100% rename from tests/functional/centos/7/raw-multi-journal/group_vars/osds rename to tests/functional/centos/7/journal-collocation/group_vars/osds diff --git a/tests/functional/centos/7/raw-multi-journal/hosts b/tests/functional/centos/7/journal-collocation/hosts similarity index 100% rename from tests/functional/centos/7/raw-multi-journal/hosts rename to tests/functional/centos/7/journal-collocation/hosts diff --git a/tests/functional/centos/7/raw-multi-journal/scenario.py b/tests/functional/centos/7/journal-collocation/scenario.py similarity index 100% rename from tests/functional/centos/7/raw-multi-journal/scenario.py rename to tests/functional/centos/7/journal-collocation/scenario.py diff --git a/tests/functional/centos/7/raw-multi-journal/vagrant_variables.yml b/tests/functional/centos/7/journal-collocation/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/raw-multi-journal/vagrant_variables.yml rename to tests/functional/centos/7/journal-collocation/vagrant_variables.yml diff --git a/tox.ini b/tox.ini index 1a84fa6e9..a6806e2e8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {ansible2.2}-{xenial-conf-tests,xenial-mon-osd,xenial-cluster,raw-multi-journal,centos7-cluster,dmcrypt-journal,dmcrypt-journal-collocation} +envlist = {ansible2.2}-{xenial-conf-tests,xenial-mon-osd,xenial-cluster,journal-collocation,centos7-cluster,dmcrypt-journal,dmcrypt-journal-collocation} skipsdist = True [testenv] @@ -22,8 +22,8 @@ changedir= xenial-mon-osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using journal_collocation OSD scenario xenial-cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw - # tests a 1 mon 1 osd centos7 cluster using raw_multi_journal OSD scenario - raw-multi-journal: {toxinidir}/tests/functional/centos/7/raw-multi-journal + # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario + journal-collocation: {toxinidir}/tests/functional/centos/7/journal-collocation # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario dmcrypt-journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario -- 2.39.5