add regression/multifs collection; run rgw tests under both xfs and btrfs

diff --git a/suites/regression/basic/tasks/rgw_readwrite.yaml b/suites/regression/basic/tasks/rgw_readwrite.yaml
deleted file mode 100644 (file)
index 3e59fc2..0000000
--- a/suites/regression/basic/tasks/rgw_readwrite.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3readwrite:
-    client.0:
-      rgw_server: client.0
-      readwrite:
-        bucket: rwtest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500 

diff --git a/suites/regression/basic/tasks/rgw_roundtrip.yaml b/suites/regression/basic/tasks/rgw_roundtrip.yaml
deleted file mode 100644 (file)
index 348919b..0000000
--- a/suites/regression/basic/tasks/rgw_roundtrip.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3roundtrip:
-    client.0:
-      rgw_server: client.0
-      roundtrip:
-        bucket: rttest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500 

diff --git a/suites/regression/basic/tasks/rgw_s3tests.yaml b/suites/regression/basic/tasks/rgw_s3tests.yaml
deleted file mode 100644 (file)
index 13d265d..0000000
--- a/suites/regression/basic/tasks/rgw_s3tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/regression/multifs/clusters/fixed-3.yaml b/suites/regression/multifs/clusters/fixed-3.yaml
new file mode 120000 (symlink)
index 0000000..a3ac9fc
--- /dev/null
+++ b/suites/regression/multifs/clusters/fixed-3.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3.yaml
\ No newline at end of file

diff --git a/suites/regression/multifs/fs/btrfs.yaml b/suites/regression/multifs/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/regression/multifs/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

diff --git a/suites/regression/multifs/fs/xfs.yaml b/suites/regression/multifs/fs/xfs.yaml
new file mode 100644 (file)
index 0000000..bfc3d61
--- /dev/null
+++ b/suites/regression/multifs/fs/xfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: xfs

diff --git a/suites/regression/multifs/tasks/rgw_readwrite.yaml b/suites/regression/multifs/tasks/rgw_readwrite.yaml
new file mode 100644 (file)
index 0000000..3e59fc2
--- /dev/null
+++ b/suites/regression/multifs/tasks/rgw_readwrite.yaml
@@ -0,0 +1,15 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500 

diff --git a/suites/regression/multifs/tasks/rgw_roundtrip.yaml b/suites/regression/multifs/tasks/rgw_roundtrip.yaml
new file mode 100644 (file)
index 0000000..348919b
--- /dev/null
+++ b/suites/regression/multifs/tasks/rgw_roundtrip.yaml
@@ -0,0 +1,15 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3roundtrip:
+    client.0:
+      rgw_server: client.0
+      roundtrip:
+        bucket: rttest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500 

diff --git a/suites/regression/multifs/tasks/rgw_s3tests.yaml b/suites/regression/multifs/tasks/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..13d265d
--- /dev/null
+++ b/suites/regression/multifs/tasks/rgw_s3tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      rgw_server: client.0