From bafbeebf08e3b2eb211320080ed10a5a133f4b80 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 2 Sep 2016 10:33:58 +0100 Subject: [PATCH] suites: switch filesystem tests from btrfs to xfs btrfs threw up occasional failures, and the long term target will be bluestore instead of btrfs. Signed-off-by: John Spray --- suites/fs/32bits/fs/btrfs.yaml | 1 - suites/fs/32bits/fs/xfs.yaml | 1 + suites/fs/basic/fs/btrfs.yaml | 1 - suites/fs/basic/fs/xfs.yaml | 1 + suites/fs/multiclient/fs/btrfs.yaml | 1 - suites/fs/multiclient/fs/xfs.yaml | 1 + suites/fs/permission/fs/btrfs.yaml | 1 - suites/fs/permission/fs/xfs.yaml | 1 + suites/fs/snaps/fs/btrfs.yaml | 6 ------ suites/fs/snaps/fs/xfs.yaml | 1 + suites/fs/thrash/fs/btrfs.yaml | 1 - suites/fs/thrash/fs/xfs.yaml | 1 + suites/fs/traceless/fs/btrfs.yaml | 1 - suites/fs/traceless/fs/xfs.yaml | 1 + suites/fs/verify/fs/btrfs.yaml | 1 - suites/fs/verify/fs/xfs.yaml | 1 + suites/kcephfs/cephfs/fs/btrfs.yaml | 1 - suites/kcephfs/cephfs/fs/xfs.yaml | 1 + suites/kcephfs/mixed-clients/fs/btrfs.yaml | 1 - suites/kcephfs/mixed-clients/fs/xfs.yaml | 1 + suites/kcephfs/thrash/fs/btrfs.yaml | 1 - suites/kcephfs/thrash/fs/xfs.yaml | 1 + suites/knfs/basic/fs/btrfs.yaml | 1 - suites/knfs/basic/fs/xfs.yaml | 1 + suites/multimds/basic/fs/btrfs.yaml | 1 - suites/multimds/basic/fs/xfs.yaml | 1 + suites/multimds/libcephfs/fs/btrfs.yaml | 1 - suites/multimds/libcephfs/fs/xfs.yaml | 1 + suites/multimds/verify/fs/btrfs.yaml | 1 - suites/multimds/verify/fs/xfs.yaml | 1 + suites/samba/fs/btrfs.yaml | 1 - suites/samba/fs/xfs.yaml | 1 + 32 files changed, 16 insertions(+), 21 deletions(-) delete mode 120000 suites/fs/32bits/fs/btrfs.yaml create mode 120000 suites/fs/32bits/fs/xfs.yaml delete mode 120000 suites/fs/basic/fs/btrfs.yaml create mode 120000 suites/fs/basic/fs/xfs.yaml delete mode 120000 suites/fs/multiclient/fs/btrfs.yaml create mode 120000 suites/fs/multiclient/fs/xfs.yaml delete mode 120000 suites/fs/permission/fs/btrfs.yaml create mode 120000 suites/fs/permission/fs/xfs.yaml delete mode 100644 suites/fs/snaps/fs/btrfs.yaml create mode 120000 suites/fs/snaps/fs/xfs.yaml delete mode 120000 suites/fs/thrash/fs/btrfs.yaml create mode 120000 suites/fs/thrash/fs/xfs.yaml delete mode 120000 suites/fs/traceless/fs/btrfs.yaml create mode 120000 suites/fs/traceless/fs/xfs.yaml delete mode 120000 suites/fs/verify/fs/btrfs.yaml create mode 120000 suites/fs/verify/fs/xfs.yaml delete mode 120000 suites/kcephfs/cephfs/fs/btrfs.yaml create mode 120000 suites/kcephfs/cephfs/fs/xfs.yaml delete mode 120000 suites/kcephfs/mixed-clients/fs/btrfs.yaml create mode 120000 suites/kcephfs/mixed-clients/fs/xfs.yaml delete mode 120000 suites/kcephfs/thrash/fs/btrfs.yaml create mode 120000 suites/kcephfs/thrash/fs/xfs.yaml delete mode 120000 suites/knfs/basic/fs/btrfs.yaml create mode 120000 suites/knfs/basic/fs/xfs.yaml delete mode 120000 suites/multimds/basic/fs/btrfs.yaml create mode 120000 suites/multimds/basic/fs/xfs.yaml delete mode 120000 suites/multimds/libcephfs/fs/btrfs.yaml create mode 120000 suites/multimds/libcephfs/fs/xfs.yaml delete mode 120000 suites/multimds/verify/fs/btrfs.yaml create mode 120000 suites/multimds/verify/fs/xfs.yaml delete mode 120000 suites/samba/fs/btrfs.yaml create mode 120000 suites/samba/fs/xfs.yaml diff --git a/suites/fs/32bits/fs/btrfs.yaml b/suites/fs/32bits/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/32bits/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/32bits/fs/xfs.yaml b/suites/fs/32bits/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/32bits/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/basic/fs/btrfs.yaml b/suites/fs/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/basic/fs/xfs.yaml b/suites/fs/basic/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/basic/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/multiclient/fs/btrfs.yaml b/suites/fs/multiclient/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/multiclient/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/multiclient/fs/xfs.yaml b/suites/fs/multiclient/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/multiclient/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/permission/fs/btrfs.yaml b/suites/fs/permission/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/permission/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/permission/fs/xfs.yaml b/suites/fs/permission/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/permission/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/snaps/fs/btrfs.yaml b/suites/fs/snaps/fs/btrfs.yaml deleted file mode 100644 index 4c7af311538..00000000000 --- a/suites/fs/snaps/fs/btrfs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - fs: btrfs - conf: - osd: - osd op thread timeout: 60 diff --git a/suites/fs/snaps/fs/xfs.yaml b/suites/fs/snaps/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/snaps/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/thrash/fs/btrfs.yaml b/suites/fs/thrash/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/thrash/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/thrash/fs/xfs.yaml b/suites/fs/thrash/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/thrash/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/traceless/fs/btrfs.yaml b/suites/fs/traceless/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/traceless/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/traceless/fs/xfs.yaml b/suites/fs/traceless/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/traceless/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/fs/verify/fs/btrfs.yaml b/suites/fs/verify/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/fs/verify/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/verify/fs/xfs.yaml b/suites/fs/verify/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/fs/verify/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/cephfs/fs/btrfs.yaml b/suites/kcephfs/cephfs/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/kcephfs/cephfs/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/cephfs/fs/xfs.yaml b/suites/kcephfs/cephfs/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/kcephfs/cephfs/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/mixed-clients/fs/btrfs.yaml b/suites/kcephfs/mixed-clients/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/kcephfs/mixed-clients/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/mixed-clients/fs/xfs.yaml b/suites/kcephfs/mixed-clients/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/kcephfs/mixed-clients/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/thrash/fs/btrfs.yaml b/suites/kcephfs/thrash/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/kcephfs/thrash/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/kcephfs/thrash/fs/xfs.yaml b/suites/kcephfs/thrash/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/kcephfs/thrash/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/knfs/basic/fs/btrfs.yaml b/suites/knfs/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/knfs/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/knfs/basic/fs/xfs.yaml b/suites/knfs/basic/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/knfs/basic/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/basic/fs/btrfs.yaml b/suites/multimds/basic/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/multimds/basic/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/multimds/basic/fs/xfs.yaml b/suites/multimds/basic/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/multimds/basic/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/fs/btrfs.yaml b/suites/multimds/libcephfs/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/multimds/libcephfs/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/fs/xfs.yaml b/suites/multimds/libcephfs/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/multimds/libcephfs/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/verify/fs/btrfs.yaml b/suites/multimds/verify/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266..00000000000 --- a/suites/multimds/verify/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/multimds/verify/fs/xfs.yaml b/suites/multimds/verify/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/multimds/verify/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/samba/fs/btrfs.yaml b/suites/samba/fs/btrfs.yaml deleted file mode 120000 index ea693ab0b42..00000000000 --- a/suites/samba/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/samba/fs/xfs.yaml b/suites/samba/fs/xfs.yaml new file mode 120000 index 00000000000..4c28d731f6b --- /dev/null +++ b/suites/samba/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file -- 2.39.5