From: Patrick Donnelly Date: Tue, 13 Jul 2021 18:31:47 +0000 (-0700) Subject: qa: split fs begin task X-Git-Tag: v17.1.0~13^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d9bfc26537c9918f3b99120ea94c5969cc53dc0;p=ceph.git qa: split fs begin task To allow switching to cephadm task. Signed-off-by: Patrick Donnelly (cherry picked from commit 50c39dc007615902e1fb040c03965c0bb3edc142) Conflicts: qa/cephfs/begin/0-install.yaml --- diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin.yaml deleted file mode 100644 index 879294a1fdc..00000000000 --- a/qa/cephfs/begin.yaml +++ /dev/null @@ -1,56 +0,0 @@ -log-rotate: - ceph-mds: 10G - ceph-osd: 10G -tasks: - - install: - extra_packages: - rpm: - - python3-cephfs - - cephfs-top - - cephfs-mirror - deb: - - python3-cephfs - - cephfs-shell - - cephfs-top - - cephfs-mirror - # For kernel_untar_build workunit - extra_system_packages: - deb: - - bison - - flex - - libelf-dev - - libssl-dev - - network-manager - - iproute2 - - util-linux - # for xfstests-dev - - dump - - indent - # for fsx - - libaio-dev - - libtool-bin - - uuid-dev - - xfslibs-dev - rpm: - - bison - - flex - - elfutils-libelf-devel - - openssl-devel - - NetworkManager - - iproute - - util-linux - # for xfstests-dev - - libacl-devel - - libaio-devel - - libattr-devel - - libtool - - libuuid-devel - - xfsdump - - xfsprogs - - xfsprogs-devel - # for fsx - - libaio-devel - - libtool - - libuuid-devel - - xfsprogs-devel - - ceph: diff --git a/qa/cephfs/begin/+ b/qa/cephfs/begin/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/cephfs/begin/0-install.yaml b/qa/cephfs/begin/0-install.yaml new file mode 100644 index 00000000000..cd2b9971140 --- /dev/null +++ b/qa/cephfs/begin/0-install.yaml @@ -0,0 +1,52 @@ +tasks: + - install: + extra_packages: + rpm: + - python3-cephfs + - cephfs-top + - cephfs-mirror + deb: + - python3-cephfs + - cephfs-shell + - cephfs-top + - cephfs-mirror + # For kernel_untar_build workunit + extra_system_packages: + deb: + - bison + - flex + - libelf-dev + - libssl-dev + - network-manager + - iproute2 + - util-linux + # for xfstests-dev + - dump + - indent + # for fsx + - libaio-dev + - libtool-bin + - uuid-dev + - xfslibs-dev + rpm: + - bison + - flex + - elfutils-libelf-devel + - openssl-devel + - NetworkManager + - iproute + - util-linux + # for xfstests-dev + - libacl-devel + - libaio-devel + - libattr-devel + - libtool + - libuuid-devel + - xfsdump + - xfsprogs + - xfsprogs-devel + # for fsx + - libaio-devel + - libtool + - libuuid-devel + - xfsprogs-devel 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