From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 30 Oct 2020 02:09:59 +0000 (-0700)
Subject: qa: relocate tasks
X-Git-Tag: v16.1.0~689^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98614207714fa532c15a2ce3ebb9052858d55925;p=ceph.git

qa: relocate tasks

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

diff --git a/qa/suites/fs/functional/tasks/truncate_delay.yaml b/qa/suites/fs/functional/tasks/truncate_delay.yaml
new file mode 100644
index 0000000000000..b47b565691460
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/truncate_delay.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        ms_inject_delay_probability: 1
+        ms_inject_delay_type: osd
+        ms_inject_delay_max: 5
+        client_oc_max_dirty_age: 1
+tasks:
+- exec:
+    client.0:
+      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
+      - sleep 2
+      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo
diff --git a/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_norstats.yaml b/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_norstats.yaml
deleted file mode 100644
index 016e339eefd08..0000000000000
--- a/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_norstats.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - fs/norstats
-overrides:
-  kclient:
-    rbytes: false
-  ceph:
-    conf:
-      client:
-        client dirsize rbytes: false
diff --git a/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml b/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml
deleted file mode 100644
index b47b565691460..0000000000000
--- a/qa/suites/fs/workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        ms_inject_delay_probability: 1
-        ms_inject_delay_type: osd
-        ms_inject_delay_max: 5
-        client_oc_max_dirty_age: 1
-tasks:
-- exec:
-    client.0:
-      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
-      - sleep 2
-      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml b/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
new file mode 100644
index 0000000000000..016e339eefd08
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
@@ -0,0 +1,16 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - fs/norstats
+overrides:
+  kclient:
+    rbytes: false
+  ceph:
+    conf:
+      client:
+        client dirsize rbytes: false