From: Patrick Donnelly Date: Thu, 24 Jun 2021 03:37:02 +0000 (-0700) Subject: qa: convert fs:workload to use cephadm X-Git-Tag: v17.1.0~13^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2c7fe2e7f12bedc8b42d9db4d08fdb61d8549bd;p=ceph.git qa: convert fs:workload to use cephadm Note: it's important to keep the install task which supplies packages needed for some workloads. Fixes: https://tracker.ceph.com/issues/51333 Signed-off-by: Patrick Donnelly (cherry picked from commit 405bb2e48e5914e4b849bca5cb32660f13c4a00a) --- diff --git a/qa/suites/fs/workload/begin b/qa/suites/fs/workload/begin deleted file mode 120000 index 77af91f7d266..000000000000 --- a/qa/suites/fs/workload/begin +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/+ b/qa/suites/fs/workload/begin/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/fs/workload/begin/.qa b/qa/suites/fs/workload/begin/.qa new file mode 120000 index 000000000000..fea2489fdf6d --- /dev/null +++ b/qa/suites/fs/workload/begin/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/0-install.yaml b/qa/suites/fs/workload/begin/0-install.yaml new file mode 120000 index 000000000000..3b18529732df --- /dev/null +++ b/qa/suites/fs/workload/begin/0-install.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin/0-install.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/1-cephadm.yaml b/qa/suites/fs/workload/begin/1-cephadm.yaml new file mode 100644 index 000000000000..a58ea5725f52 --- /dev/null +++ b/qa/suites/fs/workload/begin/1-cephadm.yaml @@ -0,0 +1,21 @@ +overrides: + ceph: + conf: + osd: + osd shutdown pgref assert: true +tasks: +- cephadm: + roleless: false +- cephadm.shell: + mon.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls +- cephadm.shell: + mon.a: + - ceph fs dump + - ceph osd dump +- fs.ready: + timeout: 300 diff --git a/qa/suites/fs/workload/begin/2-logrotate.yaml b/qa/suites/fs/workload/begin/2-logrotate.yaml new file mode 120000 index 000000000000..9d6e7ba8335b --- /dev/null +++ b/qa/suites/fs/workload/begin/2-logrotate.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin/2-logrotate.yaml \ No newline at end of file