From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 29 Oct 2020 20:35:37 +0000 (-0700)
Subject: qa: move kcephfs:mixed-clients to fs
X-Git-Tag: v16.1.0~689^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbdb6537e2b79f6d7744b0013c90f3a2ebf15cca;p=ceph.git

qa: move kcephfs:mixed-clients to fs

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

diff --git a/qa/suites/fs/mixed-clients/% b/qa/suites/fs/mixed-clients/%
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/fs/mixed-clients/.qa b/qa/suites/fs/mixed-clients/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/begin.yaml b/qa/suites/fs/mixed-clients/begin.yaml
new file mode 120000
index 0000000000000..311d404f7c276
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/begin.yaml
@@ -0,0 +1 @@
+.qa/cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/clusters/.qa b/qa/suites/fs/mixed-clients/clusters/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/clusters/1a3s-mds-2c-client.yaml b/qa/suites/fs/mixed-clients/clusters/1a3s-mds-2c-client.yaml
new file mode 120000
index 0000000000000..c190ea92ff5bc
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/clusters/1a3s-mds-2c-client.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1a3s-mds-2c-client.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/conf b/qa/suites/fs/mixed-clients/conf
new file mode 120000
index 0000000000000..16e8cc44b7d7a
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/kclient-overrides b/qa/suites/fs/mixed-clients/kclient-overrides
new file mode 120000
index 0000000000000..58b04fb24a8c5
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/kclient-overrides
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/objectstore-ec b/qa/suites/fs/mixed-clients/objectstore-ec
new file mode 120000
index 0000000000000..affe294932e25
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/objectstore-ec
@@ -0,0 +1 @@
+.qa/cephfs/objectstore-ec
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/overrides/+ b/qa/suites/fs/mixed-clients/overrides/+
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/fs/mixed-clients/overrides/.qa b/qa/suites/fs/mixed-clients/overrides/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml b/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml
new file mode 120000
index 0000000000000..34a39a368cf15
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/overrides/osd-asserts.yaml b/qa/suites/fs/mixed-clients/overrides/osd-asserts.yaml
new file mode 120000
index 0000000000000..f290c749bdcb8
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/overrides/osd-asserts.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/osd-asserts.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/overrides/whitelist_health.yaml b/qa/suites/fs/mixed-clients/overrides/whitelist_health.yaml
new file mode 120000
index 0000000000000..74f39a49b27ed
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/overrides/whitelist_health.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml
new file mode 120000
index 0000000000000..b4528c0f8c096
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/tasks/.qa b/qa/suites/fs/mixed-clients/tasks/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml b/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
new file mode 100644
index 0000000000000..78b2d7611e5b4
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
@@ -0,0 +1,18 @@
+tasks:
+- parallel:
+   - user-workload
+   - kclient-workload
+user-workload:
+  sequential:
+  - ceph-fuse: [client.0]
+  - workunit:
+      clients:
+         client.0:
+           - suites/iozone.sh
+kclient-workload:
+  sequential:
+  - kclient: [client.1]
+  - workunit:
+      clients:
+         client.1:
+           - suites/dbench.sh
diff --git a/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml b/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
new file mode 100644
index 0000000000000..d637ff989df17
--- /dev/null
+++ b/qa/suites/fs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
@@ -0,0 +1,18 @@
+tasks:
+- parallel:
+   - user-workload
+   - kclient-workload
+user-workload:
+  sequential:
+  - ceph-fuse: [client.0]
+  - workunit:
+      clients:
+         client.0:
+           - suites/blogbench.sh
+kclient-workload:
+  sequential:
+  - kclient: [client.1]
+  - workunit:
+      clients:
+         client.1:
+           - kernel_untar_build.sh
diff --git a/qa/suites/kcephfs/mixed-clients/% b/qa/suites/kcephfs/mixed-clients/%
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/qa/suites/kcephfs/mixed-clients/.qa b/qa/suites/kcephfs/mixed-clients/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/begin.yaml b/qa/suites/kcephfs/mixed-clients/begin.yaml
deleted file mode 120000
index 311d404f7c276..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/begin.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/clusters/.qa b/qa/suites/kcephfs/mixed-clients/clusters/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml b/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml
deleted file mode 120000
index 9f4f161a344a8..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/1-mds-2-client.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/conf b/qa/suites/kcephfs/mixed-clients/conf
deleted file mode 120000
index 16e8cc44b7d7a..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/conf
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/conf
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/kclient-overrides b/qa/suites/kcephfs/mixed-clients/kclient-overrides
deleted file mode 120000
index 58b04fb24a8c5..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/kclient-overrides
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient/overrides/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/objectstore-ec b/qa/suites/kcephfs/mixed-clients/objectstore-ec
deleted file mode 120000
index affe294932e25..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/objectstore-ec
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/objectstore-ec
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/+ b/qa/suites/kcephfs/mixed-clients/overrides/+
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/.qa b/qa/suites/kcephfs/mixed-clients/overrides/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/frag_enable.yaml b/qa/suites/kcephfs/mixed-clients/overrides/frag_enable.yaml
deleted file mode 120000
index 34a39a368cf15..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/osd-asserts.yaml b/qa/suites/kcephfs/mixed-clients/overrides/osd-asserts.yaml
deleted file mode 120000
index f290c749bdcb8..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/osd-asserts.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/osd-asserts.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/whitelist_health.yaml b/qa/suites/kcephfs/mixed-clients/overrides/whitelist_health.yaml
deleted file mode 120000
index 74f39a49b27ed..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/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/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/kcephfs/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000
index b4528c0f8c096..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/tasks/.qa b/qa/suites/kcephfs/mixed-clients/tasks/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
deleted file mode 100644
index 78b2d7611e5b4..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-tasks:
-- parallel:
-   - user-workload
-   - kclient-workload
-user-workload:
-  sequential:
-  - ceph-fuse: [client.0]
-  - workunit:
-      clients:
-         client.0:
-           - suites/iozone.sh
-kclient-workload:
-  sequential:
-  - kclient: [client.1]
-  - workunit:
-      clients:
-         client.1:
-           - suites/dbench.sh
diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
deleted file mode 100644
index d637ff989df17..0000000000000
--- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-tasks:
-- parallel:
-   - user-workload
-   - kclient-workload
-user-workload:
-  sequential:
-  - ceph-fuse: [client.0]
-  - workunit:
-      clients:
-         client.0:
-           - suites/blogbench.sh
-kclient-workload:
-  sequential:
-  - kclient: [client.1]
-  - workunit:
-      clients:
-         client.1:
-           - kernel_untar_build.sh