From 50c39dc007615902e1fb040c03965c0bb3edc142 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 13 Jul 2021 11:31:47 -0700 Subject: [PATCH] qa: split fs begin task To allow switching to cephadm task. Signed-off-by: Patrick Donnelly --- qa/cephfs/begin/+ | 0 qa/cephfs/{begin.yaml => begin/0-install.yaml} | 4 ---- qa/cephfs/begin/1-ceph.yaml | 5 +++++ qa/cephfs/begin/2-logrotate.yaml | 3 +++ qa/suites/fs/32bits/begin | 1 + qa/suites/fs/32bits/begin.yaml | 1 - qa/suites/fs/bugs/client_trim_caps/begin | 1 + qa/suites/fs/bugs/client_trim_caps/begin.yaml | 1 - qa/suites/fs/full/begin | 1 + qa/suites/fs/full/begin.yaml | 1 - qa/suites/fs/functional/begin | 1 + qa/suites/fs/functional/begin.yaml | 1 - qa/suites/fs/libcephfs/begin | 1 + qa/suites/fs/libcephfs/begin.yaml | 1 - qa/suites/fs/mirror-ha/begin | 1 + qa/suites/fs/mirror-ha/begin.yaml | 1 - qa/suites/fs/mirror/begin | 1 + qa/suites/fs/mirror/begin.yaml | 1 - qa/suites/fs/mixed-clients/begin | 1 + qa/suites/fs/mixed-clients/begin.yaml | 1 - qa/suites/fs/multiclient/begin | 1 + qa/suites/fs/multiclient/begin.yaml | 1 - qa/suites/fs/multifs/begin | 1 + qa/suites/fs/multifs/begin.yaml | 1 - qa/suites/fs/permission/begin | 1 + qa/suites/fs/permission/begin.yaml | 1 - qa/suites/fs/shell/begin | 1 + qa/suites/fs/shell/begin.yaml | 1 - qa/suites/fs/snaps/begin | 1 + qa/suites/fs/snaps/begin.yaml | 1 - qa/suites/fs/thrash/multifs/begin | 1 + qa/suites/fs/thrash/multifs/begin.yaml | 1 - qa/suites/fs/thrash/workloads/begin | 1 + qa/suites/fs/thrash/workloads/begin.yaml | 1 - qa/suites/fs/top/begin | 1 + qa/suites/fs/top/begin.yaml | 1 - qa/suites/fs/traceless/begin | 1 + qa/suites/fs/traceless/begin.yaml | 1 - qa/suites/fs/valgrind/begin | 1 + qa/suites/fs/valgrind/begin.yaml | 1 - qa/suites/fs/verify/begin | 1 + qa/suites/fs/verify/begin.yaml | 1 - qa/suites/fs/volumes/begin | 1 + qa/suites/fs/volumes/begin.yaml | 1 - qa/suites/fs/workload/begin | 1 + qa/suites/fs/workload/begin.yaml | 1 - 46 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 qa/cephfs/begin/+ rename qa/cephfs/{begin.yaml => begin/0-install.yaml} (95%) create mode 100644 qa/cephfs/begin/1-ceph.yaml create mode 100644 qa/cephfs/begin/2-logrotate.yaml create mode 120000 qa/suites/fs/32bits/begin delete mode 120000 qa/suites/fs/32bits/begin.yaml create mode 120000 qa/suites/fs/bugs/client_trim_caps/begin delete mode 120000 qa/suites/fs/bugs/client_trim_caps/begin.yaml create mode 120000 qa/suites/fs/full/begin delete mode 120000 qa/suites/fs/full/begin.yaml create mode 120000 qa/suites/fs/functional/begin delete mode 120000 qa/suites/fs/functional/begin.yaml create mode 120000 qa/suites/fs/libcephfs/begin delete mode 120000 qa/suites/fs/libcephfs/begin.yaml create mode 120000 qa/suites/fs/mirror-ha/begin delete mode 120000 qa/suites/fs/mirror-ha/begin.yaml create mode 120000 qa/suites/fs/mirror/begin delete mode 120000 qa/suites/fs/mirror/begin.yaml create mode 120000 qa/suites/fs/mixed-clients/begin delete mode 120000 qa/suites/fs/mixed-clients/begin.yaml create mode 120000 qa/suites/fs/multiclient/begin delete mode 120000 qa/suites/fs/multiclient/begin.yaml create mode 120000 qa/suites/fs/multifs/begin delete mode 120000 qa/suites/fs/multifs/begin.yaml create mode 120000 qa/suites/fs/permission/begin delete mode 120000 qa/suites/fs/permission/begin.yaml create mode 120000 qa/suites/fs/shell/begin delete mode 120000 qa/suites/fs/shell/begin.yaml create mode 120000 qa/suites/fs/snaps/begin delete mode 120000 qa/suites/fs/snaps/begin.yaml create mode 120000 qa/suites/fs/thrash/multifs/begin delete mode 120000 qa/suites/fs/thrash/multifs/begin.yaml create mode 120000 qa/suites/fs/thrash/workloads/begin delete mode 120000 qa/suites/fs/thrash/workloads/begin.yaml create mode 120000 qa/suites/fs/top/begin delete mode 120000 qa/suites/fs/top/begin.yaml create mode 120000 qa/suites/fs/traceless/begin delete mode 120000 qa/suites/fs/traceless/begin.yaml create mode 120000 qa/suites/fs/valgrind/begin delete mode 120000 qa/suites/fs/valgrind/begin.yaml create mode 120000 qa/suites/fs/verify/begin delete mode 120000 qa/suites/fs/verify/begin.yaml create mode 120000 qa/suites/fs/volumes/begin delete mode 120000 qa/suites/fs/volumes/begin.yaml create mode 120000 qa/suites/fs/workload/begin delete mode 120000 qa/suites/fs/workload/begin.yaml diff --git a/qa/cephfs/begin/+ b/qa/cephfs/begin/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin/0-install.yaml similarity index 95% rename from qa/cephfs/begin.yaml rename to qa/cephfs/begin/0-install.yaml index cbda380e572..d7589aaca3f 100644 --- a/qa/cephfs/begin.yaml +++ b/qa/cephfs/begin/0-install.yaml @@ -1,6 +1,3 @@ -log-rotate: - ceph-mds: 10G - ceph-osd: 10G tasks: - install: extra_packages: @@ -53,7 +50,6 @@ tasks: - libtool - libuuid-devel - xfsprogs-devel - - ceph: syslog: ignorelist: - WARNING*.*check_session_state diff --git a/qa/cephfs/begin/1-ceph.yaml b/qa/cephfs/begin/1-ceph.yaml new file mode 100644 index 00000000000..6765a266a48 --- /dev/null +++ b/qa/cephfs/begin/1-ceph.yaml @@ -0,0 +1,5 @@ +log-rotate: + ceph-mds: 10G + ceph-osd: 10G +tasks: + - ceph: diff --git a/qa/cephfs/begin/2-logrotate.yaml b/qa/cephfs/begin/2-logrotate.yaml new file mode 100644 index 00000000000..3b876f13b6a --- /dev/null +++ b/qa/cephfs/begin/2-logrotate.yaml @@ -0,0 +1,3 @@ +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/suites/fs/32bits/begin b/qa/suites/fs/32bits/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/32bits/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/32bits/begin.yaml b/qa/suites/fs/32bits/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/32bits/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/begin b/qa/suites/fs/bugs/client_trim_caps/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/bugs/client_trim_caps/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/begin.yaml b/qa/suites/fs/bugs/client_trim_caps/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/bugs/client_trim_caps/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/full/begin b/qa/suites/fs/full/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/full/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/full/begin.yaml b/qa/suites/fs/full/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/full/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/begin b/qa/suites/fs/functional/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/functional/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/functional/begin.yaml b/qa/suites/fs/functional/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/functional/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/libcephfs/begin b/qa/suites/fs/libcephfs/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/libcephfs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/libcephfs/begin.yaml b/qa/suites/fs/libcephfs/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/libcephfs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mirror-ha/begin b/qa/suites/fs/mirror-ha/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/mirror-ha/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mirror-ha/begin.yaml b/qa/suites/fs/mirror-ha/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/mirror-ha/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mirror/begin b/qa/suites/fs/mirror/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/mirror/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mirror/begin.yaml b/qa/suites/fs/mirror/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/mirror/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mixed-clients/begin b/qa/suites/fs/mixed-clients/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/mixed-clients/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mixed-clients/begin.yaml b/qa/suites/fs/mixed-clients/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/mixed-clients/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/multiclient/begin b/qa/suites/fs/multiclient/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/multiclient/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/multiclient/begin.yaml b/qa/suites/fs/multiclient/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/multiclient/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/begin b/qa/suites/fs/multifs/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/multifs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/multifs/begin.yaml b/qa/suites/fs/multifs/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/multifs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/permission/begin b/qa/suites/fs/permission/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/permission/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/permission/begin.yaml b/qa/suites/fs/permission/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/permission/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/shell/begin b/qa/suites/fs/shell/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/shell/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/shell/begin.yaml b/qa/suites/fs/shell/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/shell/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/snaps/begin b/qa/suites/fs/snaps/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/snaps/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/snaps/begin.yaml b/qa/suites/fs/snaps/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/snaps/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/multifs/begin b/qa/suites/fs/thrash/multifs/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/thrash/multifs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/multifs/begin.yaml b/qa/suites/fs/thrash/multifs/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/thrash/multifs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/begin b/qa/suites/fs/thrash/workloads/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/begin.yaml b/qa/suites/fs/thrash/workloads/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/thrash/workloads/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/top/begin b/qa/suites/fs/top/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/top/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/top/begin.yaml b/qa/suites/fs/top/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/top/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/traceless/begin b/qa/suites/fs/traceless/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/traceless/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/traceless/begin.yaml b/qa/suites/fs/traceless/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/traceless/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/valgrind/begin b/qa/suites/fs/valgrind/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/valgrind/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/valgrind/begin.yaml b/qa/suites/fs/valgrind/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/valgrind/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/begin b/qa/suites/fs/verify/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/verify/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/verify/begin.yaml b/qa/suites/fs/verify/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/verify/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/volumes/begin b/qa/suites/fs/volumes/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/volumes/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/volumes/begin.yaml b/qa/suites/fs/volumes/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/volumes/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/begin b/qa/suites/fs/workload/begin new file mode 120000 index 00000000000..77af91f7d26 --- /dev/null +++ b/qa/suites/fs/workload/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/workload/begin.yaml b/qa/suites/fs/workload/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/fs/workload/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file -- 2.47.3