marginal: remove incomplete librbd collection

Move disabled qemu + iozone task into rbd suite.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/marginal/librbd/cache b/suites/marginal/librbd/cache
deleted file mode 120000 (symlink)
index 6d352f6..0000000
--- a/suites/marginal/librbd/cache
+++ /dev/null
@@ -1 +0,0 @@
-../../regression/librbd/cache
\ No newline at end of file

diff --git a/suites/marginal/librbd/ceph b/suites/marginal/librbd/ceph
deleted file mode 120000 (symlink)
index 9ef6555..0000000
--- a/suites/marginal/librbd/ceph
+++ /dev/null
@@ -1 +0,0 @@
-../../regression/librbd/ceph
\ No newline at end of file

diff --git a/suites/marginal/librbd/clusters b/suites/marginal/librbd/clusters
deleted file mode 120000 (symlink)
index 1bb45d8..0000000
--- a/suites/marginal/librbd/clusters
+++ /dev/null
@@ -1 +0,0 @@
-../../regression/librbd/clusters
\ No newline at end of file

diff --git a/suites/marginal/librbd/fs b/suites/marginal/librbd/fs
deleted file mode 120000 (symlink)
index 34676ca..0000000
--- a/suites/marginal/librbd/fs
+++ /dev/null
@@ -1 +0,0 @@
-../../regression/librbd/fs
\ No newline at end of file

diff --git a/suites/marginal/librbd/workloads/qemu_iozone.yaml.disabled b/suites/marginal/librbd/workloads/qemu_iozone.yaml.disabled
deleted file mode 100644 (file)
index c4aefde..0000000
--- a/suites/marginal/librbd/workloads/qemu_iozone.yaml.disabled
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
-      image_size: 20480

diff --git a/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled b/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled
new file mode 100644 (file)
index 0000000..c4aefde
--- /dev/null
+++ b/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled
@@ -0,0 +1,5 @@
+tasks:
+- qemu:
+    all:
+      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
+      image_size: 20480