From 000fec3b3707022771552dfbe752c751908a65d3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 22 Jul 2012 20:47:32 -0700 Subject: [PATCH] move all kernel tests to kernel suite; symlink collections from regression Make regression a union of other topical suites. --- .../kernel/basic/tasks/kclient_workunit_direct_io.yaml | 9 ++++++++- .../kernel/basic/tasks/kclient_workunit_kclient.yaml | 7 ++++++- .../tasks/kclient_workunit_kernel_untar_build.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_suites_dbench.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_suites_fsstress.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_suites_iozone.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_suites_pjd.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_suites_tiobench.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_trivial_sync.yaml | 7 ++++++- .../basic/tasks/rbd_workunit_kernel_untar_build.yaml | 9 ++++++++- .../kernel/basic/tasks/rbd_workunit_suites_dbench.yaml | 9 ++++++++- .../kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml | 10 +++++++++- .../basic/tasks/rbd_workunit_suites_fsstress.yaml | 9 ++++++++- suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml | 9 ++++++++- .../kernel/basic/tasks/rbd_workunit_suites_iozone.yaml | 10 +++++++++- .../basic/tasks/rbd_workunit_suites_tiobench.yaml | 9 ++++++++- .../kernel/basic/tasks/rbd_workunit_trivial_sync.yaml | 8 +++++++- .../basic/tasks/kclient_workunit_direct_io.yaml | 8 -------- .../basic/tasks/kclient_workunit_kclient.yaml | 6 ------ .../tasks/kclient_workunit_kernel_untar_build.yaml | 7 ------- .../basic/tasks/kclient_workunit_suites_dbench.yaml | 7 ------- .../basic/tasks/kclient_workunit_suites_fsstress.yaml | 7 ------- .../basic/tasks/kclient_workunit_suites_iozone.yaml | 7 ------- .../basic/tasks/kclient_workunit_suites_pjd.yaml | 7 ------- .../basic/tasks/kclient_workunit_suites_tiobench.yaml | 7 ------- .../basic/tasks/kclient_workunit_trivial_sync.yaml | 6 ------ .../basic/tasks/rbd_workunit_kernel_untar_build.yaml | 8 -------- .../basic/tasks/rbd_workunit_suites_dbench.yaml | 8 -------- .../basic/tasks/rbd_workunit_suites_ffsb.yaml | 9 --------- .../basic/tasks/rbd_workunit_suites_fsstress.yaml | 8 -------- .../basic/tasks/rbd_workunit_suites_fsx.yaml | 8 -------- .../basic/tasks/rbd_workunit_suites_iozone.yaml | 9 --------- .../basic/tasks/rbd_workunit_suites_tiobench.yaml | 8 -------- .../basic/tasks/rbd_workunit_trivial_sync.yaml | 7 ------- suites/regression/basic/tasks/rbd_xfstests.yaml | 3 --- suites/regression/kernel-basic | 1 + suites/regression/kernel-thrash | 1 + .../workloads/rbd_workunit_suites_iozone.yaml.disabled | 8 -------- 38 files changed, 129 insertions(+), 155 deletions(-) mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_kclient.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml mode change 120000 => 100644 suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_direct_io.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_kclient.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml delete mode 100644 suites/regression/basic/tasks/kclient_workunit_trivial_sync.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml delete mode 100644 suites/regression/basic/tasks/rbd_workunit_trivial_sync.yaml delete mode 100644 suites/regression/basic/tasks/rbd_xfstests.yaml create mode 120000 suites/regression/kernel-basic create mode 120000 suites/regression/kernel-thrash delete mode 100644 suites/regression/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled diff --git a/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml b/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml deleted file mode 120000 index ffb1d8c4eff0e..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_direct_io.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml b/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml new file mode 100644 index 0000000000000..eb894d062a37d --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_direct_io.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - direct_io + diff --git a/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml b/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml deleted file mode 120000 index fd687cef60ac2..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_kclient.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml b/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml new file mode 100644 index 0000000000000..bb1a953627e7b --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_kclient.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: [kclient] diff --git a/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml deleted file mode 120000 index d164dc2d259a1..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml new file mode 100644 index 0000000000000..08a5fc95acdc6 --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_kernel_untar_build.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - kernel_untar_build.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml deleted file mode 120000 index 5abadc66eac45..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_suites_dbench.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml new file mode 100644 index 0000000000000..c2ba95fc1e8cb --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_suites_dbench.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - suites/dbench.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml deleted file mode 120000 index 33da5396da51b..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml new file mode 100644 index 0000000000000..9fbbe302ea206 --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_suites_fsstress.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - suites/fsstress.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml deleted file mode 120000 index 67872a02207f6..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_suites_iozone.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml new file mode 100644 index 0000000000000..8a58bdd1700e1 --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_suites_iozone.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - suites/iozone.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml deleted file mode 120000 index eb51d873b0084..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_suites_pjd.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml new file mode 100644 index 0000000000000..a5fa834e42c02 --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_suites_pjd.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - suites/pjd.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml deleted file mode 120000 index 22144bf7eb90f..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_suites_tiobench.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml b/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml new file mode 100644 index 0000000000000..8fafa8f9c725f --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_suites_tiobench.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: + - suites/tiobench.sh diff --git a/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml b/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml deleted file mode 120000 index b15cec75cb863..0000000000000 --- a/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/kclient_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml b/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml new file mode 100644 index 0000000000000..739124c1a53a5 --- /dev/null +++ b/suites/kernel/basic/tasks/kclient_workunit_trivial_sync.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph: +- kclient: +- workunit: + clients: + all: [misc/trivial_sync.sh] diff --git a/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml deleted file mode 120000 index 7704eb1d6eeef..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml new file mode 100644 index 0000000000000..09ab06caa04be --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_kernel_untar_build.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: + - kernel_untar_build.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml deleted file mode 120000 index 502f5023e05ff..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_dbench.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml new file mode 100644 index 0000000000000..64ac74d3baffd --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_dbench.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: + - suites/dbench.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml deleted file mode 120000 index 788522b96978d..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_ffsb.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml new file mode 100644 index 0000000000000..7ee08e4785715 --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_ffsb.yaml @@ -0,0 +1,9 @@ +tasks: +- ceph: +- rbd: + all: + image_size: 20480 +- workunit: + clients: + all: + - suites/ffsb.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml deleted file mode 120000 index 9cd1a1d88ea97..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml new file mode 100644 index 0000000000000..2814444c798dd --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_fsstress.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: + - suites/fsstress.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml deleted file mode 120000 index b9e82975a1739..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_fsx.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml new file mode 100644 index 0000000000000..357d049bb8b4f --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_fsx.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: + - suites/fsx.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml deleted file mode 120000 index 8fcd3918c2098..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_iozone.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml new file mode 100644 index 0000000000000..9e71c64e88c97 --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_iozone.yaml @@ -0,0 +1,9 @@ +tasks: +- ceph: +- rbd: + all: + image_size: 20480 +- workunit: + clients: + all: + - suites/iozone.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml deleted file mode 120000 index a2c3a34679ab3..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_suites_tiobench.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml b/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml new file mode 100644 index 0000000000000..5d2ba55a7b832 --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_suites_tiobench.yaml @@ -0,0 +1,8 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: + - suites/tiobench.sh diff --git a/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml b/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml deleted file mode 120000 index fe74d49ad4784..0000000000000 --- a/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../regression/basic/tasks/rbd_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml b/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml new file mode 100644 index 0000000000000..3726e247b8042 --- /dev/null +++ b/suites/kernel/basic/tasks/rbd_workunit_trivial_sync.yaml @@ -0,0 +1,7 @@ +tasks: +- ceph: +- rbd: + all: +- workunit: + clients: + all: [misc/trivial_sync.sh] diff --git a/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml b/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml deleted file mode 100644 index eb894d062a37d..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - direct_io - diff --git a/suites/regression/basic/tasks/kclient_workunit_kclient.yaml b/suites/regression/basic/tasks/kclient_workunit_kclient.yaml deleted file mode 100644 index bb1a953627e7b..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_kclient.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: [kclient] diff --git a/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml deleted file mode 100644 index 08a5fc95acdc6..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - kernel_untar_build.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml deleted file mode 100644 index c2ba95fc1e8cb..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml deleted file mode 100644 index 9fbbe302ea206..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml deleted file mode 100644 index 8a58bdd1700e1..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/iozone.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml deleted file mode 100644 index a5fa834e42c02..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/pjd.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml deleted file mode 100644 index 8fafa8f9c725f..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/tiobench.sh diff --git a/suites/regression/basic/tasks/kclient_workunit_trivial_sync.yaml b/suites/regression/basic/tasks/kclient_workunit_trivial_sync.yaml deleted file mode 100644 index 739124c1a53a5..0000000000000 --- a/suites/regression/basic/tasks/kclient_workunit_trivial_sync.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph: -- kclient: -- workunit: - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml deleted file mode 100644 index 09ab06caa04be..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: - - kernel_untar_build.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml deleted file mode 100644 index 64ac74d3baffd..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml deleted file mode 100644 index 7ee08e4785715..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- ceph: -- rbd: - all: - image_size: 20480 -- workunit: - clients: - all: - - suites/ffsb.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml deleted file mode 100644 index 2814444c798dd..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml deleted file mode 100644 index 357d049bb8b4f..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: - - suites/fsx.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml deleted file mode 100644 index 9e71c64e88c97..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- ceph: -- rbd: - all: - image_size: 20480 -- workunit: - clients: - all: - - suites/iozone.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml deleted file mode 100644 index 5d2ba55a7b832..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: - - suites/tiobench.sh diff --git a/suites/regression/basic/tasks/rbd_workunit_trivial_sync.yaml b/suites/regression/basic/tasks/rbd_workunit_trivial_sync.yaml deleted file mode 100644 index 3726e247b8042..0000000000000 --- a/suites/regression/basic/tasks/rbd_workunit_trivial_sync.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph: -- rbd: - all: -- workunit: - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/regression/basic/tasks/rbd_xfstests.yaml b/suites/regression/basic/tasks/rbd_xfstests.yaml deleted file mode 100644 index 2bfdb95b0d324..0000000000000 --- a/suites/regression/basic/tasks/rbd_xfstests.yaml +++ /dev/null @@ -1,3 +0,0 @@ -tasks: -- ceph: -- rbd.xfstests: diff --git a/suites/regression/kernel-basic b/suites/regression/kernel-basic new file mode 120000 index 0000000000000..a3c8bdbbcf6aa --- /dev/null +++ b/suites/regression/kernel-basic @@ -0,0 +1 @@ +../kernel/basic \ No newline at end of file diff --git a/suites/regression/kernel-thrash b/suites/regression/kernel-thrash new file mode 120000 index 0000000000000..6ac2a7855a3d8 --- /dev/null +++ b/suites/regression/kernel-thrash @@ -0,0 +1 @@ +../kernel/thrash \ No newline at end of file diff --git a/suites/regression/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled b/suites/regression/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled deleted file mode 100644 index d61ede1bd6636..0000000000000 --- a/suites/regression/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rbd: - all: - image_size: 20480 -- workunit: - clients: - all: - - suites/iozone.sh -- 2.39.5