From: Vasu Kulkarni Date: Fri, 18 Aug 2017 18:35:54 +0000 (-0700) Subject: Rename folders to fix task order X-Git-Tag: ses5-gm~5^2~5^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=559a47997c7f6c1e8e86e2fd06759ded0e7cccd9;p=ceph.git Rename folders to fix task order Signed-off-by: Vasu Kulkarni (cherry picked from commit 9cc00c5c1a6e99323a4655aad5c093b8d87609f6) --- diff --git a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml new file mode 100644 index 00000000000..e7e8cda4736 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml @@ -0,0 +1,23 @@ +meta: +- desc: "Build the ceph cluster using ceph-ansible" + +overrides: + ceph_ansible: + vars: + ceph_conf_overrides: + global: + osd default pool size: 2 + mon pg warn min per osd: 2 + ceph_dev: true + ceph_dev_key: https://download.ceph.com/keys/autobuild.asc + ceph_origin: upstream + ceph_test: true + ceph_stable_release: luminous + osd_scenario: collocated + journal_size: 1024 + osd_auto_discovery: false + +tasks: +- ssh-keys: +- ceph_ansible: +- install.ship_utilities: diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/bluestore_with_dmcrypt.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/bluestore_with_dmcrypt.yaml deleted file mode 100644 index 604e757ad1c..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/2-config/bluestore_with_dmcrypt.yaml +++ /dev/null @@ -1,8 +0,0 @@ -meta: -- desc: "use bluestore + dmcrypt option" - -overrides: - ceph_ansible: - vars: - osd_objectstore: bluestore - dmcrypt: True diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml deleted file mode 100644 index 4bbd1c7c5d1..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "without dmcrypt" - -overrides: - ceph_ansible: - vars: - dmcrypt: False diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_on.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_on.yaml deleted file mode 100644 index 12d63d32548..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_on.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "use dmcrypt option" - -overrides: - ceph_ansible: - vars: - dmcrypt: True diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml new file mode 100644 index 00000000000..604e757ad1c --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml @@ -0,0 +1,8 @@ +meta: +- desc: "use bluestore + dmcrypt option" + +overrides: + ceph_ansible: + vars: + osd_objectstore: bluestore + dmcrypt: True diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml new file mode 100644 index 00000000000..4bbd1c7c5d1 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml @@ -0,0 +1,7 @@ +meta: +- desc: "without dmcrypt" + +overrides: + ceph_ansible: + vars: + dmcrypt: False diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml new file mode 100644 index 00000000000..12d63d32548 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml @@ -0,0 +1,7 @@ +meta: +- desc: "use dmcrypt option" + +overrides: + ceph_ansible: + vars: + dmcrypt: True diff --git a/qa/suites/ceph-ansible/smoke/basic/3-tasks/ceph-admin-commands.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/ceph-admin-commands.yaml deleted file mode 100644 index 33642d5cfc3..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/3-tasks/ceph-admin-commands.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "Run ceph-admin-commands.sh" -tasks: -- workunit: - clients: - client.0: - - ceph-tests/ceph-admin-commands.sh diff --git a/qa/suites/ceph-ansible/smoke/basic/3-tasks/cls.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/cls.yaml deleted file mode 100644 index 781a4d4f88d..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/3-tasks/cls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "Run the rados cls tests" -tasks: -- workunit: - clients: - client.0: - - cls diff --git a/qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_import_export.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_import_export.yaml deleted file mode 100644 index 9495934e612..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_import_export.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "Run the rbd import/export tests" -tasks: -- workunit: - clients: - client.0: - - rbd/import_export.sh diff --git a/qa/suites/ceph-ansible/smoke/basic/4-tasks/ceph-admin-commands.yaml b/qa/suites/ceph-ansible/smoke/basic/4-tasks/ceph-admin-commands.yaml new file mode 100644 index 00000000000..33642d5cfc3 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/4-tasks/ceph-admin-commands.yaml @@ -0,0 +1,7 @@ +meta: +- desc: "Run ceph-admin-commands.sh" +tasks: +- workunit: + clients: + client.0: + - ceph-tests/ceph-admin-commands.sh diff --git a/qa/suites/ceph-ansible/smoke/basic/4-tasks/cls.yaml b/qa/suites/ceph-ansible/smoke/basic/4-tasks/cls.yaml new file mode 100644 index 00000000000..781a4d4f88d --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/4-tasks/cls.yaml @@ -0,0 +1,7 @@ +meta: +- desc: "Run the rados cls tests" +tasks: +- workunit: + clients: + client.0: + - cls diff --git a/qa/suites/ceph-ansible/smoke/basic/4-tasks/rbd_import_export.yaml b/qa/suites/ceph-ansible/smoke/basic/4-tasks/rbd_import_export.yaml new file mode 100644 index 00000000000..9495934e612 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/4-tasks/rbd_import_export.yaml @@ -0,0 +1,7 @@ +meta: +- desc: "Run the rbd import/export tests" +tasks: +- workunit: + clients: + client.0: + - rbd/import_export.sh diff --git a/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml deleted file mode 100644 index e7e8cda4736..00000000000 --- a/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml +++ /dev/null @@ -1,23 +0,0 @@ -meta: -- desc: "Build the ceph cluster using ceph-ansible" - -overrides: - ceph_ansible: - vars: - ceph_conf_overrides: - global: - osd default pool size: 2 - mon pg warn min per osd: 2 - ceph_dev: true - ceph_dev_key: https://download.ceph.com/keys/autobuild.asc - ceph_origin: upstream - ceph_test: true - ceph_stable_release: luminous - osd_scenario: collocated - journal_size: 1024 - osd_auto_discovery: false - -tasks: -- ssh-keys: -- ceph_ansible: -- install.ship_utilities: