use dbench workunit, not the autotest one

The autotest one uses an old tarball that doesn't build.  Workunit assumes
the dbench package is installed.

diff --git a/suites/regression/basic/tasks/cfuse_dbench.yaml b/suites/regression/basic/tasks/cfuse_dbench.yaml
deleted file mode 100644 (file)
index 66f8bb1..0000000
--- a/suites/regression/basic/tasks/cfuse_dbench.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- ceph:
-    conf:
-      client:
-        debug client: 20
-        debug ms: 1
-- ceph-fuse:
-- autotest:
-    all: [dbench]

diff --git a/suites/regression/basic/tasks/kclient_dbench.yaml b/suites/regression/basic/tasks/kclient_dbench.yaml
deleted file mode 100644 (file)
index 054dfcc..0000000
--- a/suites/regression/basic/tasks/kclient_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- autotest:
-    all: [dbench]

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..d69f29a
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/dbench.sh

diff --git a/suites/regression/basic/tasks/rbd_dbench.yaml b/suites/regression/basic/tasks/rbd_dbench.yaml
deleted file mode 100644 (file)
index e98c20e..0000000
--- a/suites/regression/basic/tasks/rbd_dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- autotest:
-    all: [dbench]

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..a120591
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_dbench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- workunit:
+    all:
+      - suites/dbench.sh

diff --git a/suites/regression/verify/tasks/cfuse_dbench.yaml b/suites/regression/verify/tasks/cfuse_dbench.yaml
deleted file mode 100644 (file)
index 66f8bb1..0000000
--- a/suites/regression/verify/tasks/cfuse_dbench.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- ceph:
-    conf:
-      client:
-        debug client: 20
-        debug ms: 1
-- ceph-fuse:
-- autotest:
-    all: [dbench]

diff --git a/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..1adff35
--- /dev/null
+++ b/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    all:
+      - suites/dbench.sh