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: v10.2.11~191^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=94e233f6c17630105de4218df3ad97c77b17c6c8;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 (cherry picked from commit 73981ad8078cba5d6efec8e67796a1dbc007063e) Conflicts: qa/suites/fs/recovery/xfs.yaml: in master, this file is factored into a facet: a/suites/fs/recovery/fs/xfs.yaml, but in jewel, it still a plain xfs.yaml. but it's good enough for us, as what we need is just xfs. --- 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 0b3f6fac7a53a..0000000000000 --- 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 b4a82911a2f75..0000000000000 --- 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/thrash/fs/xfs.yaml b/qa/suites/fs/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b45..0000000000000 --- 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/krbd/rbd-nomount/fs/btrfs.yaml b/qa/suites/krbd/rbd-nomount/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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/mixed-clients/basic/fs/btrfs.yaml b/qa/suites/mixed-clients/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e5..0000000000000 --- 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/powercycle/osd/fs/btrfs.yaml b/qa/suites/powercycle/osd/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e5..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 c11782e046270..0000000000000 --- 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 c11782e046270..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 c11782e046270..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 3658920363d1a..0000000000000 --- 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 3658920363d1a..0000000000000 --- 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/fs b/qa/suites/rbd/mirror/fs deleted file mode 120000 index 3658920363d1a..0000000000000 --- 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/qemu/fs b/qa/suites/rbd/qemu/fs deleted file mode 120000 index 3658920363d1a..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 3658920363d1a..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 b4a82911a2f75..0000000000000 --- 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/smoke/basic/fs/btrfs.yaml b/qa/suites/smoke/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e5..0000000000000 --- 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 10d0c3f1266e5..0000000000000 --- 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 e69de29bb2d1d..0000000000000 diff --git a/qa/suites/stress/thrash/fs/xfs.yaml b/qa/suites/stress/thrash/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b45..0000000000000 --- 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 4c28d731f6b45..0000000000000 --- 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 4c7af31153828..0000000000000 --- 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