qa: automate distro/kernel matrix for kclient

It's no longer necessary to pass `-k testing` to teuthology-suite. We're also
now regularly testing RHEL 7.5 kernel in upstream testing.

This work is prep for eventually integrating kclient into fs.

Fixes: http://tracker.ceph.com/issues/26995
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/cephfs/.qa b/qa/cephfs/.qa
new file mode 120000 (symlink)
index 0000000..b870225
--- /dev/null
+++ b/qa/cephfs/.qa
@@ -0,0 +1 @@
+../
\ No newline at end of file

diff --git a/qa/cephfs/clusters/.qa b/qa/cephfs/clusters/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/conf/.qa b/qa/cephfs/conf/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/conf/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/.qa b/qa/cephfs/mount/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient.yaml b/qa/cephfs/mount/kclient.yaml
deleted file mode 100644 (file)
index f00f16a..0000000
--- a/qa/cephfs/mount/kclient.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-tasks:
-- kclient:

diff --git a/qa/cephfs/mount/kclient/% b/qa/cephfs/mount/kclient/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/cephfs/mount/kclient/.qa b/qa/cephfs/mount/kclient/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/kclient/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/mount.yaml b/qa/cephfs/mount/kclient/mount.yaml
new file mode 100644 (file)
index 0000000..c9a1f5b
--- /dev/null
+++ b/qa/cephfs/mount/kclient/mount.yaml
@@ -0,0 +1,2 @@
+tasks:
+- kclient:

diff --git a/qa/cephfs/mount/kclient/overrides/% b/qa/cephfs/mount/kclient/overrides/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/cephfs/mount/kclient/overrides/.qa b/qa/cephfs/mount/kclient/overrides/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/.qa b/qa/cephfs/mount/kclient/overrides/distro/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/% b/qa/cephfs/mount/kclient/overrides/distro/random/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/.qa b/qa/cephfs/mount/kclient/overrides/distro/random/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/random/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/k-testing.yaml b/qa/cephfs/mount/kclient/overrides/distro/random/k-testing.yaml
new file mode 100644 (file)
index 0000000..21f83db
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/random/k-testing.yaml
@@ -0,0 +1,3 @@
+kernel:
+  client:
+    branch: testing

diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/supported$ b/qa/cephfs/mount/kclient/overrides/distro/random/supported$
new file mode 120000 (symlink)
index 0000000..78f2991
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/random/supported$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/% b/qa/cephfs/mount/kclient/overrides/distro/rhel/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/.qa b/qa/cephfs/mount/kclient/overrides/distro/rhel/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/rhel/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/7.5.yaml b/qa/cephfs/mount/kclient/overrides/distro/rhel/7.5.yaml
new file mode 120000 (symlink)
index 0000000..e2cdbd2
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/rhel/7.5.yaml
@@ -0,0 +1 @@
+.qa/distros/supported-all-distro/rhel_7.5.yaml
\ No newline at end of file

diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/k-distro.yaml b/qa/cephfs/mount/kclient/overrides/distro/rhel/k-distro.yaml
new file mode 100644 (file)
index 0000000..37d8890
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/distro/rhel/k-distro.yaml
@@ -0,0 +1,3 @@
+kernel:
+  client:
+    sha1: distro

diff --git a/qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml b/qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml
new file mode 100644 (file)
index 0000000..30da870
--- /dev/null
+++ b/qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false

diff --git a/qa/cephfs/objectstore-ec/.qa b/qa/cephfs/objectstore-ec/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/objectstore-ec/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/overrides/.qa b/qa/cephfs/overrides/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/overrides/fuse/.qa b/qa/cephfs/overrides/fuse/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/overrides/fuse/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/overrides/fuse/default-perm/.qa b/qa/cephfs/overrides/fuse/default-perm/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/overrides/fuse/default-perm/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/cephfs/tasks/.qa b/qa/cephfs/tasks/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/cephfs/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/cephfs/kclient b/qa/suites/kcephfs/cephfs/kclient
new file mode 120000 (symlink)
index 0000000..893d2d3
--- /dev/null
+++ b/qa/suites/kcephfs/cephfs/kclient
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient
\ No newline at end of file

diff --git a/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml
deleted file mode 100644 (file)
index 30da870..0000000
--- a/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false

diff --git a/qa/suites/kcephfs/cephfs/supported-random-distros$ b/qa/suites/kcephfs/cephfs/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/kcephfs/cephfs/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml
index cc4b32a441adf58cd8b11b0c55e0e19bbad9dcf2..d0128bce437b8dcc98af3c8f77faecb6b6490816 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml
index 84d15f66d6cfbbc07598886878eba51f02655349..5c9acc10c07593528b9d0d77b2b19968b005b764 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml
index e3f4fb17672d5c540c985a4c099a4cac800c22b2..aa62b9e8c3ad0281a63ded4d424e0a2653b24e96 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml
index 5219fc929ef81684471976571887ade0d9da13c6..91c953b964164a2aae6642fd1f0cf6e84ac7778e 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
index e8158004857f09b7ccba75df87e7403bfa58e369..790c93c2b170ef88dff9b7008747ea34681d40c7 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml
index 8dd810a3765c15761d799bdec365383b2e064b36..41b2bc8edaab2004345e56ae8e43057726720ad6 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml
index 059ffe1ea4a904445dbbb77daa5e99b4428ab40e..08586340863206ece0a265f30556c17bf521cc81 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml
index bc49fc9086c36458d6bc4bc591bd136909137b93..ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
index 38d9604fcac044a6b5ad2153904ff12e55da01d3..8b2b1ab5c141432bab1916e8346c74eb72e27791 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml
index 452641cfc9efa51bd6a85068ae577b8279f6d60e..7efa1adb82da86cd884246cb5f635ff7a866bff3 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml
index 832e0241b274ee0cbb68bdf8519665bb4dbbbcfd..9270f3c51e22b18a8870ed5962cfc1464f09ca0c 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml
index 09abaeb6eecd18ad74ab9992f67ca84816537426..e8882134c72d88e00dd8ca1674ff4ef4200ddfee 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml
index d317a3929830479d070e4839efa73aca656d9e41..36e7411b6385a6ddb05054513a542e546dbcd8d2 100644 (file)
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all: [fs/misc/trivial_sync.sh]

diff --git a/qa/suites/kcephfs/mixed-clients/kclient-overrides b/qa/suites/kcephfs/mixed-clients/kclient-overrides
new file mode 120000 (symlink)
index 0000000..58b04fb
--- /dev/null
+++ b/qa/suites/kcephfs/mixed-clients/kclient-overrides
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml
deleted file mode 100644 (file)
index 30da870..0000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false

diff --git a/qa/suites/kcephfs/mixed-clients/supported-random-distros$ b/qa/suites/kcephfs/mixed-clients/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/kcephfs/mixed-clients/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/dirfrag/.qa b/qa/suites/kcephfs/recovery/dirfrag/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/kcephfs/recovery/dirfrag/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/dirfrag/frag_enable.yaml b/qa/suites/kcephfs/recovery/dirfrag/frag_enable.yaml
deleted file mode 100644 (file)
index 9913fa1..0000000
--- a/qa/suites/kcephfs/recovery/dirfrag/frag_enable.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      mds:
-        mds bal frag: true
-        mds bal fragment size max: 10000
-        mds bal split size: 100
-        mds bal merge size: 5
-        mds bal split bits: 3
-

diff --git a/qa/suites/kcephfs/recovery/kclient b/qa/suites/kcephfs/recovery/kclient
new file mode 120000 (symlink)
index 0000000..22f94e1
--- /dev/null
+++ b/qa/suites/kcephfs/recovery/kclient
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/mounts/.qa b/qa/suites/kcephfs/recovery/mounts/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/kcephfs/recovery/mounts/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml b/qa/suites/kcephfs/recovery/mounts/kmounts.yaml
deleted file mode 100644 (file)
index c9a1f5b..0000000
--- a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- kclient:

diff --git a/qa/suites/kcephfs/recovery/supported-random-distros$ b/qa/suites/kcephfs/recovery/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/kcephfs/recovery/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/whitelist_health.yaml b/qa/suites/kcephfs/recovery/whitelist_health.yaml
deleted file mode 120000 (symlink)
index 74f39a4..0000000
--- a/qa/suites/kcephfs/recovery/whitelist_health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/kclient b/qa/suites/kcephfs/thrash/kclient
new file mode 120000 (symlink)
index 0000000..22f94e1
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/kclient
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml
deleted file mode 100644 (file)
index 30da870..0000000
--- a/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false

diff --git a/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml b/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml
new file mode 120000 (symlink)
index 0000000..9124eb1
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml
@@ -0,0 +1 @@
+.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/supported-random-distros$ b/qa/suites/kcephfs/thrash/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/kcephfs/thrash/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/thrashosds-health.yaml b/qa/suites/kcephfs/thrash/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/kcephfs/thrash/thrashosds-health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/whitelist_health.yaml b/qa/suites/kcephfs/thrash/whitelist_health.yaml
deleted file mode 120000 (symlink)
index 74f39a4..0000000
--- a/qa/suites/kcephfs/thrash/whitelist_health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml
index 0c4a1528d080abad2ac9d9803737ae331596c8e5..4a2a627fe5d327bfc03df40ec4d3564c65bf8938 100644 (file)
--- a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml
+++ b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml
@@ -4,7 +4,6 @@ overrides:
       osd:
         filestore flush min: 0
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml
index 832e0241b274ee0cbb68bdf8519665bb4dbbbcfd..9270f3c51e22b18a8870ed5962cfc1464f09ca0c 100644 (file)
--- a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml
+++ b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml
@@ -1,5 +1,4 @@
 tasks:
-- kclient:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/multimds/basic/mount b/qa/suites/multimds/basic/mount
new file mode 120000 (symlink)
index 0000000..e3600f4
--- /dev/null
+++ b/qa/suites/multimds/basic/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/mount/.qa b/qa/suites/multimds/basic/mount/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/multimds/basic/mount/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/mount/fuse.yaml b/qa/suites/multimds/basic/mount/fuse.yaml
deleted file mode 120000 (symlink)
index 0e55da9..0000000
--- a/qa/suites/multimds/basic/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/mount/kclient.yaml b/qa/suites/multimds/basic/mount/kclient.yaml
deleted file mode 120000 (symlink)
index 16b1f6d..0000000
--- a/qa/suites/multimds/basic/mount/kclient.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/supported-random-distros$ b/qa/suites/multimds/basic/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/multimds/basic/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/multimds/thrash/mount b/qa/suites/multimds/thrash/mount
new file mode 120000 (symlink)
index 0000000..e3600f4
--- /dev/null
+++ b/qa/suites/multimds/thrash/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
\ No newline at end of file

diff --git a/qa/suites/multimds/thrash/mount/.qa b/qa/suites/multimds/thrash/mount/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/multimds/thrash/mount/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/multimds/thrash/mount/fuse.yaml b/qa/suites/multimds/thrash/mount/fuse.yaml
deleted file mode 120000 (symlink)
index 0e55da9..0000000
--- a/qa/suites/multimds/thrash/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/thrash/mount/kclient.yaml b/qa/suites/multimds/thrash/mount/kclient.yaml
deleted file mode 120000 (symlink)
index 16b1f6d..0000000
--- a/qa/suites/multimds/thrash/mount/kclient.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/thrash/supported-random-distros$ b/qa/suites/multimds/thrash/supported-random-distros$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/multimds/thrash/supported-random-distros$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient.yaml b/qa/suites/multimds/verify/mount/kclient.yaml
deleted file mode 120000 (symlink)
index 16b1f6d..0000000
--- a/qa/suites/multimds/verify/mount/kclient.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/+ b/qa/suites/multimds/verify/mount/kclient/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/multimds/verify/mount/kclient/.qa b/qa/suites/multimds/verify/mount/kclient/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/multimds/verify/mount/kclient/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/kernel-testing.yaml b/qa/suites/multimds/verify/mount/kclient/kernel-testing.yaml
new file mode 120000 (symlink)
index 0000000..8c351d8
--- /dev/null
+++ b/qa/suites/multimds/verify/mount/kclient/kernel-testing.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/distro/random/kernel-testing.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/mount.yaml b/qa/suites/multimds/verify/mount/kclient/mount.yaml
new file mode 120000 (symlink)
index 0000000..9967f23
--- /dev/null
+++ b/qa/suites/multimds/verify/mount/kclient/mount.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/mount.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml b/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml
new file mode 120000 (symlink)
index 0000000..1912a0c
--- /dev/null
+++ b/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml
\ No newline at end of file