Merge pull request ceph#14198 from liewegas/wip-fs

qa/suites: drop 'fs' facet, and add 'objectstore' facet where missing Reviewed-by: Josh Durgin <[email protected]> Reviewed-by: Jason Dillaman <[email protected]>
heyingstar · Apr 8, 2017 · 14e7d63 · 14e7d63
2 parents 93f9f4a + 29a19dc
commit 14e7d63
Show file tree

Hide file tree

Showing 80 changed files with 18 additions and 86 deletions.
diff --git a/qa/objectstore/bluestore.yaml b/qa/objectstore/bluestore.yaml
@@ -3,6 +3,7 @@ overrides:
     bdev_inject_crash: 2
     bdev_inject_crash_probability: .5
   ceph:
+    fs: xfs
     conf:
       osd:
         osd objectstore: bluestore

diff --git a/qa/suites/big/rados-thrash/fs/btrfs.yaml → qa/objectstore/filestore-btrfs.yaml b/qa/suites/big/rados-thrash/fs/btrfs.yaml → qa/objectstore/filestore-btrfs.yaml
@@ -3,5 +3,5 @@ overrides:
     fs: btrfs
     conf:
       osd:
-        osd sloppy crc: true
+        osd objectstore: filestore
         osd op thread timeout: 60
diff --git a/qa/suites/rgw/verify/fs/xfs.yaml → qa/objectstore/filestore-xfs.yaml b/qa/suites/rgw/verify/fs/xfs.yaml → qa/objectstore/filestore-xfs.yaml
@@ -3,4 +3,5 @@ overrides:
     fs: xfs
     conf:
       osd:
+        osd objectstore: filestore
         osd sloppy crc: true
diff --git a/qa/objectstore/filestore.yaml b/qa/objectstore/filestore.yaml
diff --git a/qa/suites/big/rados-thrash/fs/xfs.yaml b/qa/suites/big/rados-thrash/fs/xfs.yaml
diff --git a/qa/suites/big/rados-thrash/objectstore b/qa/suites/big/rados-thrash/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/fs/32bits/fs/xfs.yaml b/qa/suites/fs/32bits/fs/xfs.yaml
diff --git a/qa/suites/fs/basic/fs/xfs.yaml b/qa/suites/fs/basic/fs/xfs.yaml
diff --git a/qa/suites/fs/multiclient/fs/xfs.yaml b/qa/suites/fs/multiclient/fs/xfs.yaml
diff --git a/qa/suites/fs/multifs/fs/xfs.yaml b/qa/suites/fs/multifs/fs/xfs.yaml
diff --git a/qa/suites/fs/permission/fs/xfs.yaml b/qa/suites/fs/permission/fs/xfs.yaml
diff --git a/qa/suites/fs/recovery/fs/xfs.yaml b/qa/suites/fs/recovery/fs/xfs.yaml
diff --git a/qa/suites/fs/snaps/fs/xfs.yaml b/qa/suites/fs/snaps/fs/xfs.yaml
diff --git a/qa/suites/fs/standbyreplay/fs/xfs.yaml b/qa/suites/fs/standbyreplay/fs/xfs.yaml
diff --git a/qa/suites/fs/thrash/fs/xfs.yaml b/qa/suites/fs/thrash/fs/xfs.yaml
diff --git a/qa/suites/fs/traceless/fs/xfs.yaml b/qa/suites/fs/traceless/fs/xfs.yaml
diff --git a/qa/suites/fs/verify/fs/xfs.yaml b/qa/suites/fs/verify/fs/xfs.yaml
diff --git a/qa/suites/kcephfs/cephfs/fs/xfs.yaml b/qa/suites/kcephfs/cephfs/fs/xfs.yaml
diff --git a/qa/suites/kcephfs/cephfs/objectstore b/qa/suites/kcephfs/cephfs/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/kcephfs/mixed-clients/fs/xfs.yaml b/qa/suites/kcephfs/mixed-clients/fs/xfs.yaml
diff --git a/qa/suites/kcephfs/mixed-clients/objectstore b/qa/suites/kcephfs/mixed-clients/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/kcephfs/recovery/objectstore b/qa/suites/kcephfs/recovery/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/kcephfs/thrash/fs/xfs.yaml b/qa/suites/kcephfs/thrash/fs/xfs.yaml
diff --git a/qa/suites/kcephfs/thrash/objectstore b/qa/suites/kcephfs/thrash/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/knfs/basic/fs/xfs.yaml b/qa/suites/knfs/basic/fs/xfs.yaml
diff --git a/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml b/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml
diff --git a/qa/suites/krbd/rbd/fs/btrfs.yaml b/qa/suites/krbd/rbd/fs/btrfs.yaml
diff --git a/qa/suites/krbd/singleton/fs/btrfs.yaml b/qa/suites/krbd/singleton/fs/btrfs.yaml
diff --git a/qa/suites/krbd/thrash/fs/btrfs.yaml b/qa/suites/krbd/thrash/fs/btrfs.yaml
diff --git a/qa/suites/marginal/basic/fs/btrfs.yaml b/qa/suites/marginal/basic/fs/btrfs.yaml
diff --git a/qa/suites/marginal/fs-misc/fs/btrfs.yaml b/qa/suites/marginal/fs-misc/fs/btrfs.yaml
diff --git a/qa/suites/marginal/multimds/fs/btrfs.yaml b/qa/suites/marginal/multimds/fs/btrfs.yaml
diff --git a/qa/suites/mgr/basic/fs/xfs.yaml b/qa/suites/mgr/basic/fs/xfs.yaml
diff --git a/qa/suites/mgr/basic/objectstore b/qa/suites/mgr/basic/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/mixed-clients/basic/fs/btrfs.yaml b/qa/suites/mixed-clients/basic/fs/btrfs.yaml
diff --git a/qa/suites/mixed-clients/basic/objectstore b/qa/suites/mixed-clients/basic/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/multimds/basic/fs b/qa/suites/multimds/basic/fs
diff --git a/qa/suites/multimds/basic/objectstore b/qa/suites/multimds/basic/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/multimds/thrash/fs b/qa/suites/multimds/thrash/fs
diff --git a/qa/suites/multimds/thrash/objectstore b/qa/suites/multimds/thrash/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/multimds/verify/fs b/qa/suites/multimds/verify/fs
diff --git a/qa/suites/multimds/verify/objectstore b/qa/suites/multimds/verify/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/powercycle/osd/fs/btrfs.yaml b/qa/suites/powercycle/osd/fs/btrfs.yaml
diff --git a/qa/suites/powercycle/osd/fs/xfs.yaml b/qa/suites/powercycle/osd/fs/xfs.yaml
diff --git a/qa/suites/rados/basic/fs/btrfs.yaml b/qa/suites/rados/basic/fs/btrfs.yaml
diff --git a/qa/suites/rados/basic/fs/xfs.yaml b/qa/suites/rados/basic/fs/xfs.yaml
diff --git a/qa/suites/rados/monthrash/fs/xfs.yaml b/qa/suites/rados/monthrash/fs/xfs.yaml
diff --git a/qa/suites/rados/multimon/fs/xfs.yaml b/qa/suites/rados/multimon/fs/xfs.yaml
diff --git a/qa/suites/rados/singleton/fs/xfs.yaml b/qa/suites/rados/singleton/fs/xfs.yaml
diff --git a/qa/suites/rados/thrash-erasure-code-big/fs b/qa/suites/rados/thrash-erasure-code-big/fs
diff --git a/qa/suites/rados/thrash-erasure-code-isa/fs b/qa/suites/rados/thrash-erasure-code-isa/fs
diff --git a/qa/suites/rados/thrash-erasure-code-shec/fs/xfs.yaml b/qa/suites/rados/thrash-erasure-code-shec/fs/xfs.yaml
diff --git a/qa/suites/rados/thrash-erasure-code/fs b/qa/suites/rados/thrash-erasure-code/fs
diff --git a/qa/suites/rados/thrash/fs/btrfs.yaml b/qa/suites/rados/thrash/fs/btrfs.yaml
diff --git a/qa/suites/rados/thrash/fs/xfs.yaml b/qa/suites/rados/thrash/fs/xfs.yaml
diff --git a/qa/suites/rados/verify/fs/btrfs.yaml b/qa/suites/rados/verify/fs/btrfs.yaml
diff --git a/qa/suites/rbd/basic/fs/xfs.yaml b/qa/suites/rbd/basic/fs/xfs.yaml
diff --git a/qa/suites/rbd/cli/fs b/qa/suites/rbd/cli/fs
diff --git a/qa/suites/rbd/librbd/fs b/qa/suites/rbd/librbd/fs
diff --git a/qa/suites/rbd/mirror-ha/fs b/qa/suites/rbd/mirror-ha/fs
diff --git a/qa/suites/rbd/mirror/fs b/qa/suites/rbd/mirror/fs
diff --git a/qa/suites/rbd/nbd/fs b/qa/suites/rbd/nbd/fs
diff --git a/qa/suites/rbd/openstack/fs b/qa/suites/rbd/openstack/fs
diff --git a/qa/suites/rbd/qemu/fs b/qa/suites/rbd/qemu/fs
diff --git a/qa/suites/rbd/thrash/fs/xfs.yaml b/qa/suites/rbd/thrash/fs/xfs.yaml
diff --git a/qa/suites/rbd/valgrind/fs b/qa/suites/rbd/valgrind/fs
diff --git a/qa/suites/rgw/multifs/fs/xfs.yaml b/qa/suites/rgw/multifs/fs/xfs.yaml
diff --git a/qa/suites/rgw/singleton/fs/xfs.yaml b/qa/suites/rgw/singleton/fs/xfs.yaml
diff --git a/qa/suites/samba/fs/xfs.yaml b/qa/suites/samba/fs/xfs.yaml
diff --git a/qa/suites/samba/objectstore b/qa/suites/samba/objectstore
@@ -0,0 +1 @@
+../../objectstore
diff --git a/qa/suites/smoke/1node/filestore-xfs.yaml b/qa/suites/smoke/1node/filestore-xfs.yaml
@@ -0,0 +1 @@
+../../../objectstore/filestore-xfs.yaml
diff --git a/qa/suites/smoke/basic/bluestore.yaml b/qa/suites/smoke/basic/bluestore.yaml
@@ -0,0 +1 @@
+../../../objectstore/bluestore.yaml
diff --git a/qa/suites/smoke/basic/fs/btrfs.yaml b/qa/suites/smoke/basic/fs/btrfs.yaml
diff --git a/qa/suites/smoke/basic/objectstore b/qa/suites/smoke/basic/objectstore
@@ -0,0 +1 @@
+../../../objectstore
diff --git a/qa/suites/smoke/systemd/bluestore.yaml b/qa/suites/smoke/systemd/bluestore.yaml
@@ -0,0 +1 @@
+../../../objectstore/bluestore.yaml
diff --git a/qa/suites/stress/thrash/fs/btrfs.yaml b/qa/suites/stress/thrash/fs/btrfs.yaml
diff --git a/qa/suites/stress/thrash/fs/none.yaml b/qa/suites/stress/thrash/fs/none.yaml
diff --git a/qa/suites/stress/thrash/fs/xfs.yaml b/qa/suites/stress/thrash/fs/xfs.yaml
diff --git a/qa/suites/teuthology/multi-cluster/fs/xfs.yaml b/qa/suites/teuthology/multi-cluster/fs/xfs.yaml
diff --git a/qa/suites/tgt/basic/fs/btrfs.yaml b/qa/suites/tgt/basic/fs/btrfs.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ overrides: @@
         bdev_inject_crash: 2
         bdev_inject_crash_probability: .5
       ceph:
+        fs: xfs
         conf:
           osd:
             osd objectstore: bluestore
@@ Expand Down @@