qa/suites/fs: put simple functional tests together

Most of what's in basic/ is "workload" type testing
(i.e. a simple cluster cluster configuration and then
running a script inside the client), which gets
permuted in various ways.  Move the simpler
functional tests out with the others like themselves.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/qa/suites/fs/basic/tasks/asok_dump_tree.yaml b/qa/suites/fs/basic/tasks/asok_dump_tree.yaml
deleted file mode 100644 (file)
index 7fa5614..0000000
--- a/qa/suites/fs/basic/tasks/asok_dump_tree.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_dump_tree

diff --git a/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
deleted file mode 100644 (file)
index 3b27146..0000000
--- a/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - Scrub error on inode
-      - Behind on trimming
-      - Metadata damage detected
-    conf:
-      mds:
-        mds log max segments: 1
-        mds cache max size: 1000
-tasks:
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_scrub_checks

diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_quota.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_quota.yaml
deleted file mode 100644 (file)
index 7908bc8..0000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_quota.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - fs/quota
-
-overrides:
-  ceph:
-    conf:
-      client:
-        client quota: true

diff --git a/qa/suites/fs/basic/tasks/libcephfs_java.yaml b/qa/suites/fs/basic/tasks/libcephfs_java.yaml
deleted file mode 100644 (file)
index aaffa03..0000000
--- a/qa/suites/fs/basic/tasks/libcephfs_java.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
-overrides:
-  ceph-fuse:
-    disabled: true
-  kclient:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs-java/test.sh

diff --git a/qa/suites/fs/basic/tasks/libcephfs_python.yaml b/qa/suites/fs/basic/tasks/libcephfs_python.yaml
deleted file mode 100644 (file)
index e5cbb14..0000000
--- a/qa/suites/fs/basic/tasks/libcephfs_python.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true
-  kclient:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - fs/test_python.sh

diff --git a/qa/suites/fs/basic/tasks/mds_creation_retry.yaml b/qa/suites/fs/basic/tasks/mds_creation_retry.yaml
deleted file mode 100644 (file)
index fd23aa8..0000000
--- a/qa/suites/fs/basic/tasks/mds_creation_retry.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
--mds_creation_failure:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]
-

diff --git a/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml b/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml
deleted file mode 100644 (file)
index 02c8cf4..0000000
--- a/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true

diff --git a/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml b/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml
new file mode 100644 (file)
index 0000000..7fa5614
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephfs_test_runner:
+    modules:
+      - tasks.cephfs.test_dump_tree

diff --git a/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml
new file mode 100644 (file)
index 0000000..3b27146
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - Scrub error on inode
+      - Behind on trimming
+      - Metadata damage detected
+    conf:
+      mds:
+        mds log max segments: 1
+        mds cache max size: 1000
+tasks:
+- cephfs_test_runner:
+    modules:
+      - tasks.cephfs.test_scrub_checks

diff --git a/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml b/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml
new file mode 100644 (file)
index 0000000..7908bc8
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml
@@ -0,0 +1,12 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - fs/quota
+
+overrides:
+  ceph:
+    conf:
+      client:
+        client quota: true

diff --git a/qa/suites/fs/recovery/tasks/libcephfs_java.yaml b/qa/suites/fs/recovery/tasks/libcephfs_java.yaml
new file mode 100644 (file)
index 0000000..aaffa03
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/libcephfs_java.yaml
@@ -0,0 +1,14 @@
+
+os_type: ubuntu
+os_version: "14.04"
+
+overrides:
+  ceph-fuse:
+    disabled: true
+  kclient:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs-java/test.sh

diff --git a/qa/suites/fs/recovery/tasks/libcephfs_python.yaml b/qa/suites/fs/recovery/tasks/libcephfs_python.yaml
new file mode 100644 (file)
index 0000000..e5cbb14
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/libcephfs_python.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph-fuse:
+    disabled: true
+  kclient:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - fs/test_python.sh

diff --git a/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml b/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml
new file mode 100644 (file)
index 0000000..fd23aa8
--- /dev/null
+++ b/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml
@@ -0,0 +1,6 @@
+tasks:
+-mds_creation_failure:
+- workunit:
+    clients:
+      all: [fs/misc/trivial_sync.sh]
+