qa: stop testing btrfs

This is too noisy and we don't recommend it anyway.

See http://tracker.ceph.com/issues/20169

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5a2d78ad85ef7adcb716f98b1ba28c1463d2ed53)

Conflicts:
	qa/objectstore/filestore-btrfs.yaml: we add some notes in this
file in master, but didn't backport the commit(s) adding these notes to
jewel. we are removing this file anyway. so who cares!

diff --git a/qa/objectstore/filestore-btrfs.yaml b/qa/objectstore/filestore-btrfs.yaml
deleted file mode 100644 (file)
index 8eea43e..0000000
--- a/qa/objectstore/filestore-btrfs.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    fs: btrfs
-    conf:
-      osd:
-        osd objectstore: filestore
-        osd op thread timeout: 60

diff --git a/qa/suites/krbd/rbd/tasks/rbd_workunit_suites_fsstress_btrfs.yaml b/qa/suites/krbd/rbd/tasks/rbd_workunit_suites_fsstress_btrfs.yaml
deleted file mode 100644 (file)
index f3930a8..0000000
--- a/qa/suites/krbd/rbd/tasks/rbd_workunit_suites_fsstress_btrfs.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-- ceph:
-- rbd:
-    all:
-      fs_type: btrfs
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml
index cd12eaef5701c420496b071ec940156e7d2f50af..b58487c0785328ab40782180a534b057e68edff9 100644 (file)
--- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml b/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml
index c4be4cd1de9f2e0112b4b0aa676949a6ce0bae68..dc6df2f709fbcb15498f8b37063669e10f73022f 100644 (file)
--- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml
+++ b/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - ceph-fuse: [client.0]
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml b/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml
index 29ccf4630516c831ca64e5588dc526bb7b2dd858..21820071dbc28457768e119a5a39934e556074e1 100644 (file)
--- a/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml
+++ b/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml
@@ -6,7 +6,6 @@ overrides:
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - kclient:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml b/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml
index 4996d33ca24fa2d98a2a7fe5928b4e05cb358fd3..aa2e7679a772455435d476521f52b660629b09b8 100644 (file)
--- a/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml
+++ b/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml
@@ -10,7 +10,6 @@ overrides:
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
index a060fbc7d23df586c8a804f618d513e315e9d490..038f7f93d51037bbd8b3fa2cc69d30d581a94408 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install: null
 - ceph:
-    fs: btrfs
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/qa/suites/smoke/basic/tasks/rados_python.yaml b/qa/suites/smoke/basic/tasks/rados_python.yaml
index 399967cc1c935284eaa73a676a9c6a3c15a5c2ae..862f21466cab9f8189a0d03c230ee29696847710 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_python.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_python.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-    fs: btrfs
     log-whitelist:
       - wrongly marked me down
 - ceph-fuse:

diff --git a/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml b/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml
index 7ed61d0a339bc12ee6a9a8134216b87177b5a023..9714a6e40ee378b4e563d3f76ecca70ba66c25e3 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml b/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml
index e4961dd3dab6aba503bb7d9142808790fcc5b541..237aa4b319b3c6e72d0c86869c0f827a5fb57f0a 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml
+++ b/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml
@@ -8,7 +8,6 @@ overrides:
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - rbd:
     all:
       image_size: 20480

diff --git a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
index 49f28b5dd753a5150fa8b4aa965c4ba8f7b52712..b7a27881b8fd237df40cba847f468aac468beb0b 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
@@ -6,7 +6,6 @@ overrides:
 tasks:
 - install:
 - ceph:
-    fs: btrfs
 - rgw: [client.0]
 - s3tests:
     client.0: