btrfs: 1 -> fs: btrfs

diff --git a/suites/regression/basic/btrfs/with-btrfs.yaml b/suites/regression/basic/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/suites/regression/basic/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

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

diff --git a/suites/regression/multiclient/btrfs/with-btrfs.yaml b/suites/regression/multiclient/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/suites/regression/multiclient/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

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

diff --git a/suites/regression/singleton/btrfs/with-btrfs.yaml b/suites/regression/singleton/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/suites/regression/singleton/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

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

diff --git a/suites/regression/thrash/btrfs/with-btrfs.yaml b/suites/regression/thrash/btrfs/with-btrfs.yaml
index a16cc1b323eb01d03b699b9c05893835e3615758..0e9746f72355b2f5f705ce2831c5a5d63641ff28 100644 (file)
--- a/suites/regression/thrash/btrfs/with-btrfs.yaml
+++ b/suites/regression/thrash/btrfs/with-btrfs.yaml
@@ -1,3 +1,3 @@
 overrides:
   ceph:
-    btrfs: 1
+    fs: btrfs

diff --git a/suites/stress/basic/btrfs/with-btrfs.yaml b/suites/stress/basic/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/suites/stress/basic/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

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

diff --git a/suites/stress/thrash/btrfs/with-btrfs.yaml b/suites/stress/thrash/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/suites/stress/thrash/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

diff --git a/suites/stress/thrash/btrfs/without-btrfs.yaml b/suites/stress/thrash/btrfs/without-btrfs.yaml
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/suites/stress/thrash/fs/without-btrfs.yaml b/suites/stress/thrash/fs/without-btrfs.yaml
new file mode 100644 (file)
index 0000000..e69de29