From: Vasu Kulkarni Date: Fri, 6 Jul 2018 22:03:17 +0000 (-0700) Subject: qa/tests: remove ceph-disk tests and default all tests to use ceph-volume X-Git-Tag: v14.0.1~903^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff1f97e276acf763c8d424fcd993c594dc9d6b0c;p=ceph-ci.git qa/tests: remove ceph-disk tests and default all tests to use ceph-volume Signed-off-by: Vasu Kulkarni --- diff --git a/qa/suites/ceph-deploy/% b/qa/suites/ceph-deploy/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/ceph-deploy/basic/% b/qa/suites/ceph-deploy/basic/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/ceph-deploy/basic/.qa b/qa/suites/ceph-deploy/basic/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml deleted file mode 100644 index 859a37faa88..00000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - dmcrypt: yes diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml deleted file mode 100644 index 5c998c512d3..00000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - separate_journal_disk: diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml deleted file mode 100644 index ea3f63415df..00000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - separate_journal_disk: yes diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml deleted file mode 100644 index 59cb799726e..00000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml +++ /dev/null @@ -1,4 +0,0 @@ -overrides: - ceph-deploy: - dmcrypt: yes - separate_journal_disk: yes diff --git a/qa/suites/ceph-deploy/basic/config_options/.qa b/qa/suites/ceph-deploy/basic/config_options/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/config_options/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml b/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml deleted file mode 100644 index 7f9f0b797d3..00000000000 --- a/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph-deploy: - conf: - global: - mon pg warn min per osd: 2 - osd pool default size: 2 diff --git a/qa/suites/ceph-deploy/basic/distros/.qa b/qa/suites/ceph-deploy/basic/distros/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/distros/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml b/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/objectstore/.qa b/qa/suites/ceph-deploy/basic/objectstore/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/objectstore/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml b/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml deleted file mode 120000 index 961c6c6ac3f..00000000000 --- a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml b/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml deleted file mode 120000 index 41f2a9d14db..00000000000 --- a/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/objectstore/filestore-xfs.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/python_versions/.qa b/qa/suites/ceph-deploy/basic/python_versions/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/python_versions/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml b/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml deleted file mode 100644 index 51c865bfa87..00000000000 --- a/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - python_version: "2" diff --git a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml b/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml deleted file mode 100644 index 22deecaeab6..00000000000 --- a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - python_version: "3" diff --git a/qa/suites/ceph-deploy/basic/tasks/.qa b/qa/suites/ceph-deploy/basic/tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/basic/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml deleted file mode 100644 index 967ce802f92..00000000000 --- a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml +++ /dev/null @@ -1,24 +0,0 @@ -openstack: - - machine: - disk: 10 - volumes: - count: 2 - size: 110 -roles: -- - mon.a - - mgr.x - - mds.a - - osd.0 -- - osd.1 - - mon.b - - client.0 -tasks: -- ssh_keys: -- print: "**** done ssh_keys" -- ceph-deploy: -- print: "**** done ceph-deploy" -- workunit: - clients: - client.0: - - ceph-tests/ceph-admin-commands.sh -- print: "**** done ceph-tests/ceph-admin-commands.sh" diff --git a/qa/suites/ceph-deploy/ceph-volume/% b/qa/suites/ceph-deploy/ceph-volume/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/ceph-deploy/ceph-volume/.qa b/qa/suites/ceph-deploy/ceph-volume/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/cluster/.qa b/qa/suites/ceph-deploy/ceph-volume/cluster/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/cluster/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml b/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml deleted file mode 100644 index bf4a7f98695..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml +++ /dev/null @@ -1,15 +0,0 @@ -overrides: - ansible.cephlab: - vars: - quick_lvs_to_create: 4 -openstack: - - machine: - disk: 10 - volumes: - count: 4 - size: 20 -roles: -- [mon.a, mgr.y, osd.0, osd.1] -- [mon.b, osd.2, osd.3] -- [mon.c, osd.4, osd.5] -- [mgr.x, client.0] diff --git a/qa/suites/ceph-deploy/ceph-volume/config/.qa b/qa/suites/ceph-deploy/ceph-volume/config/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/config/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml b/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml deleted file mode 100644 index 09701441498..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-deploy: - use-ceph-volume: True diff --git a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml b/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml deleted file mode 100644 index d7185631450..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml +++ /dev/null @@ -1,4 +0,0 @@ -overrides: - ceph-deploy: - use-ceph-volume: True - filestore: True diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/.qa b/qa/suites/ceph-deploy/ceph-volume/distros/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/distros/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml b/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/tasks/.qa b/qa/suites/ceph-deploy/ceph-volume/tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml b/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml deleted file mode 100644 index 1c09735a6bc..00000000000 --- a/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: "Setup cluster using ceph-deploy, Run the rbd import/export tests" -tasks: -- ssh-keys: -- ceph-deploy: -- workunit: - clients: - client.0: - - rbd/import_export.sh diff --git a/qa/suites/ceph-deploy/cluster/.qa b/qa/suites/ceph-deploy/cluster/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/ceph-deploy/cluster/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/cluster/4node.yaml b/qa/suites/ceph-deploy/cluster/4node.yaml new file mode 100644 index 00000000000..bf4a7f98695 --- /dev/null +++ b/qa/suites/ceph-deploy/cluster/4node.yaml @@ -0,0 +1,15 @@ +overrides: + ansible.cephlab: + vars: + quick_lvs_to_create: 4 +openstack: + - machine: + disk: 10 + volumes: + count: 4 + size: 20 +roles: +- [mon.a, mgr.y, osd.0, osd.1] +- [mon.b, osd.2, osd.3] +- [mon.c, osd.4, osd.5] +- [mgr.x, client.0] diff --git a/qa/suites/ceph-deploy/config/.qa b/qa/suites/ceph-deploy/config/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/ceph-deploy/config/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml b/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml new file mode 100644 index 00000000000..e484e612035 --- /dev/null +++ b/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml @@ -0,0 +1,7 @@ +overrides: + ceph-deploy: + use-ceph-volume: True + bluestore: True + conf: + osd: + bluestore fsck on mount: true diff --git a/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml b/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml new file mode 100644 index 00000000000..d424b642347 --- /dev/null +++ b/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml @@ -0,0 +1,8 @@ +overrides: + ceph-deploy: + use-ceph-volume: True + bluestore: True + dmcrypt: True + conf: + osd: + bluestore fsck on mount: true diff --git a/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml new file mode 100644 index 00000000000..09701441498 --- /dev/null +++ b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml @@ -0,0 +1,3 @@ +overrides: + ceph-deploy: + use-ceph-volume: True diff --git a/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml new file mode 100644 index 00000000000..d7185631450 --- /dev/null +++ b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml @@ -0,0 +1,4 @@ +overrides: + ceph-deploy: + use-ceph-volume: True + filestore: True diff --git a/qa/suites/ceph-deploy/distros/.qa b/qa/suites/ceph-deploy/distros/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/ceph-deploy/distros/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/distros/centos_latest.yaml b/qa/suites/ceph-deploy/distros/centos_latest.yaml new file mode 120000 index 00000000000..bd9854e7029 --- /dev/null +++ b/qa/suites/ceph-deploy/distros/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml new file mode 120000 index 00000000000..3a09f9abb05 --- /dev/null +++ b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/python_versions/.qa b/qa/suites/ceph-deploy/python_versions/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/ceph-deploy/python_versions/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/python_versions/python_2.yaml b/qa/suites/ceph-deploy/python_versions/python_2.yaml new file mode 100644 index 00000000000..51c865bfa87 --- /dev/null +++ b/qa/suites/ceph-deploy/python_versions/python_2.yaml @@ -0,0 +1,3 @@ +overrides: + ceph-deploy: + python_version: "2" diff --git a/qa/suites/ceph-deploy/python_versions/python_3.yaml b/qa/suites/ceph-deploy/python_versions/python_3.yaml new file mode 100644 index 00000000000..22deecaeab6 --- /dev/null +++ b/qa/suites/ceph-deploy/python_versions/python_3.yaml @@ -0,0 +1,3 @@ +overrides: + ceph-deploy: + python_version: "3" diff --git a/qa/suites/ceph-deploy/tasks/.qa b/qa/suites/ceph-deploy/tasks/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/ceph-deploy/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml new file mode 100644 index 00000000000..b7dbfe1ae82 --- /dev/null +++ b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml @@ -0,0 +1,12 @@ +meta: +- desc: "test basic ceph admin commands" +tasks: +- ssh_keys: +- print: "**** done ssh_keys" +- ceph-deploy: +- print: "**** done ceph-deploy" +- workunit: + clients: + client.0: + - ceph-tests/ceph-admin-commands.sh +- print: "**** done ceph-tests/ceph-admin-commands.sh" diff --git a/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml new file mode 100644 index 00000000000..1c09735a6bc --- /dev/null +++ b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml @@ -0,0 +1,9 @@ +meta: +- desc: "Setup cluster using ceph-deploy, Run the rbd import/export tests" +tasks: +- ssh-keys: +- ceph-deploy: +- workunit: + clients: + client.0: + - rbd/import_export.sh