From: Sage Weil Date: Tue, 28 Mar 2017 15:57:21 +0000 (-0400) Subject: qa/suites: remove 'fs' facet from all tests X-Git-Tag: v12.0.2~145^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73981ad8078cba5d6efec8e67796a1dbc007063e;p=ceph.git qa/suites: remove 'fs' facet from all tests The objectstore facet now covers bluestore, filestore(xfs), and filestore(btrfs). Signed-off-by: Sage Weil --- diff --git a/qa/suites/big/rados-thrash/fs/btrfs.yaml b/qa/suites/big/rados-thrash/fs/btrfs.yaml deleted file mode 100644 index 0b3f6fac7a53..000000000000 --- a/qa/suites/big/rados-thrash/fs/btrfs.yaml +++ /dev/null @@ -1,7 +0,0 @@ -overrides: - ceph: - fs: btrfs - conf: - osd: - osd sloppy crc: true - osd op thread timeout: 60 diff --git a/qa/suites/big/rados-thrash/fs/xfs.yaml b/qa/suites/big/rados-thrash/fs/xfs.yaml deleted file mode 100644 index b4a82911a2f7..000000000000 --- a/qa/suites/big/rados-thrash/fs/xfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: xfs - conf: - osd: - osd sloppy crc: true diff --git a/qa/suites/fs/32bits/fs/xfs.yaml b/qa/suites/fs/32bits/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/32bits/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/basic/fs/xfs.yaml b/qa/suites/fs/basic/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/basic/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/multiclient/fs/xfs.yaml b/qa/suites/fs/multiclient/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/multiclient/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/fs/xfs.yaml b/qa/suites/fs/multifs/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/multifs/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/permission/fs/xfs.yaml b/qa/suites/fs/permission/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/permission/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/recovery/fs/xfs.yaml b/qa/suites/fs/recovery/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/recovery/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/snaps/fs/xfs.yaml b/qa/suites/fs/snaps/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/snaps/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/standbyreplay/fs/xfs.yaml b/qa/suites/fs/standbyreplay/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/standbyreplay/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/fs/xfs.yaml b/qa/suites/fs/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/thrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/traceless/fs/xfs.yaml b/qa/suites/fs/traceless/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/traceless/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/fs/xfs.yaml b/qa/suites/fs/verify/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/fs/verify/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/cephfs/fs/xfs.yaml b/qa/suites/kcephfs/cephfs/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/kcephfs/cephfs/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/mixed-clients/fs/xfs.yaml b/qa/suites/kcephfs/mixed-clients/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/kcephfs/mixed-clients/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/thrash/fs/xfs.yaml b/qa/suites/kcephfs/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/kcephfs/thrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/knfs/basic/fs/xfs.yaml b/qa/suites/knfs/basic/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/knfs/basic/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml b/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/rbd/fs/btrfs.yaml b/qa/suites/krbd/rbd/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/krbd/rbd/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/singleton/fs/btrfs.yaml b/qa/suites/krbd/singleton/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/krbd/singleton/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/thrash/fs/btrfs.yaml b/qa/suites/krbd/thrash/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/krbd/thrash/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/marginal/basic/fs/btrfs.yaml b/qa/suites/marginal/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/marginal/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/marginal/fs-misc/fs/btrfs.yaml b/qa/suites/marginal/fs-misc/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/marginal/fs-misc/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/marginal/multimds/fs/btrfs.yaml b/qa/suites/marginal/multimds/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/marginal/multimds/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/mgr/basic/fs/xfs.yaml b/qa/suites/mgr/basic/fs/xfs.yaml deleted file mode 100644 index b4a82911a2f7..000000000000 --- a/qa/suites/mgr/basic/fs/xfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: xfs - conf: - osd: - osd sloppy crc: true diff --git a/qa/suites/mixed-clients/basic/fs/btrfs.yaml b/qa/suites/mixed-clients/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/mixed-clients/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/multimds/basic/fs b/qa/suites/multimds/basic/fs deleted file mode 120000 index a7abfe444093..000000000000 --- a/qa/suites/multimds/basic/fs +++ /dev/null @@ -1 +0,0 @@ -../../fs/basic/fs/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/fs b/qa/suites/multimds/thrash/fs deleted file mode 120000 index 0f27b427e68b..000000000000 --- a/qa/suites/multimds/thrash/fs +++ /dev/null @@ -1 +0,0 @@ -../../fs/thrash/fs/ \ No newline at end of file diff --git a/qa/suites/multimds/verify/fs b/qa/suites/multimds/verify/fs deleted file mode 120000 index 3d1f584bb7a3..000000000000 --- a/qa/suites/multimds/verify/fs +++ /dev/null @@ -1 +0,0 @@ -../../fs/verify/fs/ \ No newline at end of file diff --git a/qa/suites/powercycle/osd/fs/btrfs.yaml b/qa/suites/powercycle/osd/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/powercycle/osd/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/powercycle/osd/fs/xfs.yaml b/qa/suites/powercycle/osd/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/powercycle/osd/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/basic/fs/btrfs.yaml b/qa/suites/rados/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/rados/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/basic/fs/xfs.yaml b/qa/suites/rados/basic/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/basic/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/monthrash/fs/xfs.yaml b/qa/suites/rados/monthrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/monthrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/multimon/fs/xfs.yaml b/qa/suites/rados/multimon/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/multimon/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton/fs/xfs.yaml b/qa/suites/rados/singleton/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/singleton/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-big/fs b/qa/suites/rados/thrash-erasure-code-big/fs deleted file mode 120000 index c11782e04627..000000000000 --- a/qa/suites/rados/thrash-erasure-code-big/fs +++ /dev/null @@ -1 +0,0 @@ -../thrash/fs \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-isa/fs b/qa/suites/rados/thrash-erasure-code-isa/fs deleted file mode 120000 index c11782e04627..000000000000 --- a/qa/suites/rados/thrash-erasure-code-isa/fs +++ /dev/null @@ -1 +0,0 @@ -../thrash/fs \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-shec/fs/xfs.yaml b/qa/suites/rados/thrash-erasure-code-shec/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/thrash-erasure-code-shec/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code/fs b/qa/suites/rados/thrash-erasure-code/fs deleted file mode 120000 index c11782e04627..000000000000 --- a/qa/suites/rados/thrash-erasure-code/fs +++ /dev/null @@ -1 +0,0 @@ -../thrash/fs \ No newline at end of file diff --git a/qa/suites/rados/thrash/fs/btrfs.yaml b/qa/suites/rados/thrash/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/rados/thrash/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash/fs/xfs.yaml b/qa/suites/rados/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rados/thrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rados/verify/fs/btrfs.yaml b/qa/suites/rados/verify/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/rados/verify/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/rbd/basic/fs/xfs.yaml b/qa/suites/rbd/basic/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rbd/basic/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rbd/cli/fs b/qa/suites/rbd/cli/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/cli/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rbd/librbd/fs b/qa/suites/rbd/librbd/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/librbd/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rbd/mirror-ha/fs b/qa/suites/rbd/mirror-ha/fs deleted file mode 120000 index 9b9ab1beaec2..000000000000 --- a/qa/suites/rbd/mirror-ha/fs +++ /dev/null @@ -1 +0,0 @@ -../mirror/fs \ No newline at end of file diff --git a/qa/suites/rbd/mirror/fs b/qa/suites/rbd/mirror/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/mirror/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rbd/nbd/fs b/qa/suites/rbd/nbd/fs deleted file mode 120000 index c11782e04627..000000000000 --- a/qa/suites/rbd/nbd/fs +++ /dev/null @@ -1 +0,0 @@ -../thrash/fs \ No newline at end of file diff --git a/qa/suites/rbd/openstack/fs b/qa/suites/rbd/openstack/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/openstack/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rbd/qemu/fs b/qa/suites/rbd/qemu/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/qemu/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rbd/thrash/fs/xfs.yaml b/qa/suites/rbd/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rbd/thrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rbd/valgrind/fs b/qa/suites/rbd/valgrind/fs deleted file mode 120000 index 3658920363d1..000000000000 --- a/qa/suites/rbd/valgrind/fs +++ /dev/null @@ -1 +0,0 @@ -../basic/fs \ No newline at end of file diff --git a/qa/suites/rgw/multifs/fs/xfs.yaml b/qa/suites/rgw/multifs/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/rgw/multifs/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/rgw/singleton/fs/xfs.yaml b/qa/suites/rgw/singleton/fs/xfs.yaml deleted file mode 100644 index b4a82911a2f7..000000000000 --- a/qa/suites/rgw/singleton/fs/xfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: xfs - conf: - osd: - osd sloppy crc: true diff --git a/qa/suites/rgw/verify/fs/xfs.yaml b/qa/suites/rgw/verify/fs/xfs.yaml deleted file mode 100644 index b4a82911a2f7..000000000000 --- a/qa/suites/rgw/verify/fs/xfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: xfs - conf: - osd: - osd sloppy crc: true diff --git a/qa/suites/samba/fs/xfs.yaml b/qa/suites/samba/fs/xfs.yaml deleted file mode 120000 index 0350079c9761..000000000000 --- a/qa/suites/samba/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/smoke/basic/fs/btrfs.yaml b/qa/suites/smoke/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/smoke/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/stress/thrash/fs/btrfs.yaml b/qa/suites/stress/thrash/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/qa/suites/stress/thrash/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/qa/suites/stress/thrash/fs/none.yaml b/qa/suites/stress/thrash/fs/none.yaml deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/stress/thrash/fs/xfs.yaml b/qa/suites/stress/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/stress/thrash/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/teuthology/multi-cluster/fs/xfs.yaml b/qa/suites/teuthology/multi-cluster/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b4..000000000000 --- a/qa/suites/teuthology/multi-cluster/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/qa/suites/tgt/basic/fs/btrfs.yaml b/qa/suites/tgt/basic/fs/btrfs.yaml deleted file mode 100644 index 4c7af3115382..000000000000 --- a/qa/suites/tgt/basic/fs/btrfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: btrfs - conf: - osd: - osd op thread timeout: 60