From: Sage Weil Date: Fri, 7 Feb 2020 14:43:38 +0000 (-0600) Subject: qa/suites/rados/cephadm: collect all cephadm tests together here X-Git-Tag: v15.1.1~510^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e52c567385354c80bcc41aa693490581ce8bfa2d;p=ceph-ci.git qa/suites/rados/cephadm: collect all cephadm tests together here Signed-off-by: Sage Weil --- diff --git a/qa/suites/rados/cephadm-smoke/% b/qa/suites/rados/cephadm-smoke/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm-smoke/.qa b/qa/suites/rados/cephadm-smoke/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm-smoke/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/.qa b/qa/suites/rados/cephadm-smoke/distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/centos_7.yaml b/qa/suites/rados/cephadm-smoke/distro/centos_7.yaml deleted file mode 120000 index 5ad8254e140..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/centos_7.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/centos_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/centos_8.0.yaml b/qa/suites/rados/cephadm-smoke/distro/centos_8.0.yaml deleted file mode 120000 index f07a2bd87bd..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/centos_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/centos_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/centos_latest.yaml b/qa/suites/rados/cephadm-smoke/distro/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/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/rados/cephadm-smoke/distro/rhel_7.yaml b/qa/suites/rados/cephadm-smoke/distro/rhel_7.yaml deleted file mode 120000 index b776cd2f7b2..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/rhel_7.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm-smoke/distro/rhel_8.0.yaml deleted file mode 120000 index 7247d53d195..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/rhel_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/rhel_latest.yaml b/qa/suites/rados/cephadm-smoke/distro/rhel_latest.yaml deleted file mode 120000 index be3103a3362..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/rhel_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/rhel_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04.yaml deleted file mode 120000 index cfb85f10ef5..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm-smoke/distro/ubuntu_latest.yaml b/qa/suites/rados/cephadm-smoke/distro/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/rados/cephadm-smoke/distro/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/rados/cephadm-smoke/fixed-2.yaml b/qa/suites/rados/cephadm-smoke/fixed-2.yaml deleted file mode 100644 index 5d5fcca9c95..00000000000 --- a/qa/suites/rados/cephadm-smoke/fixed-2.yaml +++ /dev/null @@ -1,12 +0,0 @@ -roles: -- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0] -- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1] -openstack: -- volumes: # attached to each instance - count: 4 - size: 10 # GB -overrides: - ceph: - conf: - osd: - osd shutdown pgref assert: true diff --git a/qa/suites/rados/cephadm-smoke/start.yaml b/qa/suites/rados/cephadm-smoke/start.yaml deleted file mode 100644 index 0d4ca4fc76e..00000000000 --- a/qa/suites/rados/cephadm-smoke/start.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- cephadm: - conf: - mgr: - debug ms: 1 - debug mgr: 20 diff --git a/qa/suites/rados/cephadm/% b/qa/suites/rados/cephadm/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/.qa b/qa/suites/rados/cephadm/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/.qa b/qa/suites/rados/cephadm/distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/centos_8.0.yaml b/qa/suites/rados/cephadm/distro/centos_8.0.yaml deleted file mode 120000 index f07a2bd87bd..00000000000 --- a/qa/suites/rados/cephadm/distro/centos_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/centos_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/centos_latest.yaml b/qa/suites/rados/cephadm/distro/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/rados/cephadm/distro/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/rados/cephadm/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm/distro/rhel_8.0.yaml deleted file mode 120000 index 7247d53d195..00000000000 --- a/qa/suites/rados/cephadm/distro/rhel_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/rhel_latest.yaml b/qa/suites/rados/cephadm/distro/rhel_latest.yaml deleted file mode 120000 index be3103a3362..00000000000 --- a/qa/suites/rados/cephadm/distro/rhel_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/rhel_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/distro/ubuntu_18.04.yaml deleted file mode 120000 index cfb85f10ef5..00000000000 --- a/qa/suites/rados/cephadm/distro/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/distro/ubuntu_latest.yaml b/qa/suites/rados/cephadm/distro/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/rados/cephadm/distro/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/rados/cephadm/fixed-2.yaml b/qa/suites/rados/cephadm/fixed-2.yaml deleted file mode 120000 index 230ff0fdab4..00000000000 --- a/qa/suites/rados/cephadm/fixed-2.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/clusters/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/mode/.qa b/qa/suites/rados/cephadm/mode/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/mode/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/mode/packaged.yaml b/qa/suites/rados/cephadm/mode/packaged.yaml deleted file mode 100644 index ba8d432189e..00000000000 --- a/qa/suites/rados/cephadm/mode/packaged.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - cephadm: - cephadm_mode: cephadm-package - install: - extra_packages: [cephadm] diff --git a/qa/suites/rados/cephadm/mode/root.yaml b/qa/suites/rados/cephadm/mode/root.yaml deleted file mode 100644 index bedb31d5d67..00000000000 --- a/qa/suites/rados/cephadm/mode/root.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - cephadm: - cephadm_mode: root diff --git a/qa/suites/rados/cephadm/msgr b/qa/suites/rados/cephadm/msgr deleted file mode 120000 index 57bee80db00..00000000000 --- a/qa/suites/rados/cephadm/msgr +++ /dev/null @@ -1 +0,0 @@ -.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/% b/qa/suites/rados/cephadm/smoke/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rados/cephadm/smoke/.qa b/qa/suites/rados/cephadm/smoke/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/.qa b/qa/suites/rados/cephadm/smoke/distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml new file mode 120000 index 00000000000..5ad8254e140 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml new file mode 120000 index 00000000000..f07a2bd87bd --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml new file mode 120000 index 00000000000..bd9854e7029 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml new file mode 120000 index 00000000000..b776cd2f7b2 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml @@ -0,0 +1 @@ +.qa/distros/all/rhel_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml new file mode 120000 index 00000000000..7247d53d195 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml @@ -0,0 +1 @@ +.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml new file mode 120000 index 00000000000..be3103a3362 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/rhel_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml new file mode 120000 index 00000000000..cfb85f10ef5 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_latest.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_latest.yaml new file mode 120000 index 00000000000..3a09f9abb05 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/fixed-2.yaml b/qa/suites/rados/cephadm/smoke/fixed-2.yaml new file mode 100644 index 00000000000..5d5fcca9c95 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/fixed-2.yaml @@ -0,0 +1,12 @@ +roles: +- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0] +- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1] +openstack: +- volumes: # attached to each instance + count: 4 + size: 10 # GB +overrides: + ceph: + conf: + osd: + osd shutdown pgref assert: true diff --git a/qa/suites/rados/cephadm/smoke/start.yaml b/qa/suites/rados/cephadm/smoke/start.yaml new file mode 100644 index 00000000000..0d4ca4fc76e --- /dev/null +++ b/qa/suites/rados/cephadm/smoke/start.yaml @@ -0,0 +1,6 @@ +tasks: +- cephadm: + conf: + mgr: + debug ms: 1 + debug mgr: 20 diff --git a/qa/suites/rados/cephadm/start.yaml b/qa/suites/rados/cephadm/start.yaml deleted file mode 100644 index a1b89e44db8..00000000000 --- a/qa/suites/rados/cephadm/start.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- cephadm: - conf: - mgr: - debug ms: 1 - debug mgr: 20 diff --git a/qa/suites/rados/cephadm/tasks/.qa b/qa/suites/rados/cephadm/tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/tasks/rados_api_tests.yaml deleted file mode 120000 index 72299dabbf2..00000000000 --- a/qa/suites/rados/cephadm/tasks/rados_api_tests.yaml +++ /dev/null @@ -1 +0,0 @@ -../../basic/tasks/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/tasks/rados_python.yaml b/qa/suites/rados/cephadm/tasks/rados_python.yaml deleted file mode 120000 index f989c79b3ac..00000000000 --- a/qa/suites/rados/cephadm/tasks/rados_python.yaml +++ /dev/null @@ -1 +0,0 @@ -../../basic/tasks/rados_python.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/% b/qa/suites/rados/cephadm/with-work/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rados/cephadm/with-work/.qa b/qa/suites/rados/cephadm/with-work/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/.qa b/qa/suites/rados/cephadm/with-work/distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml b/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml new file mode 120000 index 00000000000..f07a2bd87bd --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml b/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml new file mode 120000 index 00000000000..bd9854e7029 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml new file mode 120000 index 00000000000..7247d53d195 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml @@ -0,0 +1 @@ +.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml b/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml new file mode 120000 index 00000000000..be3103a3362 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/rhel_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml new file mode 120000 index 00000000000..cfb85f10ef5 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_latest.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_latest.yaml new file mode 120000 index 00000000000..3a09f9abb05 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/distro/ubuntu_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/fixed-2.yaml b/qa/suites/rados/cephadm/with-work/fixed-2.yaml new file mode 120000 index 00000000000..230ff0fdab4 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/fixed-2.yaml @@ -0,0 +1 @@ +.qa/clusters/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/mode/.qa b/qa/suites/rados/cephadm/with-work/mode/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/mode/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/mode/packaged.yaml b/qa/suites/rados/cephadm/with-work/mode/packaged.yaml new file mode 100644 index 00000000000..ba8d432189e --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/mode/packaged.yaml @@ -0,0 +1,5 @@ +overrides: + cephadm: + cephadm_mode: cephadm-package + install: + extra_packages: [cephadm] diff --git a/qa/suites/rados/cephadm/with-work/mode/root.yaml b/qa/suites/rados/cephadm/with-work/mode/root.yaml new file mode 100644 index 00000000000..bedb31d5d67 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/mode/root.yaml @@ -0,0 +1,3 @@ +overrides: + cephadm: + cephadm_mode: root diff --git a/qa/suites/rados/cephadm/with-work/msgr b/qa/suites/rados/cephadm/with-work/msgr new file mode 120000 index 00000000000..57bee80db00 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/msgr @@ -0,0 +1 @@ +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/start.yaml b/qa/suites/rados/cephadm/with-work/start.yaml new file mode 100644 index 00000000000..a1b89e44db8 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/start.yaml @@ -0,0 +1,7 @@ +tasks: +- install: +- cephadm: + conf: + mgr: + debug ms: 1 + debug mgr: 20 diff --git a/qa/suites/rados/cephadm/with-work/tasks/.qa b/qa/suites/rados/cephadm/with-work/tasks/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml new file mode 120000 index 00000000000..72299dabbf2 --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml @@ -0,0 +1 @@ +../../basic/tasks/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml new file mode 120000 index 00000000000..f989c79b3ac --- /dev/null +++ b/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml @@ -0,0 +1 @@ +../../basic/tasks/rados_python.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/% b/qa/suites/rados/cephadm/workunits/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rados/cephadm/workunits/.qa b/qa/suites/rados/cephadm/workunits/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/distro/.qa b/qa/suites/rados/cephadm/workunits/distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml b/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml new file mode 120000 index 00000000000..bd9854e7029 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/distro/ubuntu_latest.yaml b/qa/suites/rados/cephadm/workunits/distro/ubuntu_latest.yaml new file mode 120000 index 00000000000..3a09f9abb05 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/distro/ubuntu_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml b/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml new file mode 100644 index 00000000000..4d253517cc9 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml @@ -0,0 +1,11 @@ +roles: +- [mon.a, mgr.x, osd.0, client.0] +tasks: +- install: +- exec: + mon.a: + - yum install -y python3 || apt install -y python3 +- workunit: + clients: + client.0: + - cephadm/test_cephadm.sh diff --git a/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml b/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml new file mode 100644 index 00000000000..94a496d66cd --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml @@ -0,0 +1,7 @@ +roles: +- [mon.a, mgr.x, osd.0, client.0] +tasks: +- workunit: + clients: + client.0: + - cephadm/test_repos.sh diff --git a/qa/suites/rados/singleton-flat/cephadm/% b/qa/suites/rados/singleton-flat/cephadm/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/singleton-flat/cephadm/.qa b/qa/suites/rados/singleton-flat/cephadm/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/singleton-flat/cephadm/distro/.qa b/qa/suites/rados/singleton-flat/cephadm/distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/singleton-flat/cephadm/distro/centos_latest.yaml b/qa/suites/rados/singleton-flat/cephadm/distro/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/distro/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/rados/singleton-flat/cephadm/distro/ubuntu_latest.yaml b/qa/suites/rados/singleton-flat/cephadm/distro/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/distro/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/rados/singleton-flat/cephadm/task/test_cephadm.yaml b/qa/suites/rados/singleton-flat/cephadm/task/test_cephadm.yaml deleted file mode 100644 index 4d253517cc9..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/task/test_cephadm.yaml +++ /dev/null @@ -1,11 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, client.0] -tasks: -- install: -- exec: - mon.a: - - yum install -y python3 || apt install -y python3 -- workunit: - clients: - client.0: - - cephadm/test_cephadm.sh diff --git a/qa/suites/rados/singleton-flat/cephadm/task/test_cephadm_repos.yaml b/qa/suites/rados/singleton-flat/cephadm/task/test_cephadm_repos.yaml deleted file mode 100644 index 94a496d66cd..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm/task/test_cephadm_repos.yaml +++ /dev/null @@ -1,7 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, client.0] -tasks: -- workunit: - clients: - client.0: - - cephadm/test_repos.sh