From a2b80c3f64c08837a62ec232b867ad345cf8a036 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 16 Apr 2016 09:01:45 -0400 Subject: [PATCH] suites/rbd: specify xfs as needed Signed-off-by: Sage Weil --- suites/rbd/maintenance/xfs.yaml | 1 + suites/rbd/singleton/all/admin_socket.yaml | 1 + suites/rbd/singleton/all/formatted-output.yaml | 1 + suites/rbd/singleton/all/merge_diff.yaml | 1 + suites/rbd/singleton/all/mirror_image_replay.yaml | 1 + suites/rbd/singleton/all/permissions.yaml | 1 + suites/rbd/singleton/all/qemu-iotests-no-cache.yaml | 1 + suites/rbd/singleton/all/qemu-iotests-writeback.yaml | 1 + suites/rbd/singleton/all/qemu-iotests-writethrough.yaml | 1 + suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml | 1 + suites/rbd/singleton/all/rbd_mirror.yaml | 1 + suites/rbd/singleton/all/read-flags-no-cache.yaml | 1 + suites/rbd/singleton/all/read-flags-writeback.yaml | 1 + suites/rbd/singleton/all/read-flags-writethrough.yaml | 1 + suites/rbd/singleton/all/verify_pool.yaml | 1 + 15 files changed, 15 insertions(+) create mode 120000 suites/rbd/maintenance/xfs.yaml diff --git a/suites/rbd/maintenance/xfs.yaml b/suites/rbd/maintenance/xfs.yaml new file mode 120000 index 00000000000..0350079c976 --- /dev/null +++ b/suites/rbd/maintenance/xfs.yaml @@ -0,0 +1 @@ +../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/rbd/singleton/all/admin_socket.yaml b/suites/rbd/singleton/all/admin_socket.yaml index cc46b50dc97..6394cc7ef00 100644 --- a/suites/rbd/singleton/all/admin_socket.yaml +++ b/suites/rbd/singleton/all/admin_socket.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/test_admin_socket.sh] diff --git a/suites/rbd/singleton/all/formatted-output.yaml b/suites/rbd/singleton/all/formatted-output.yaml index f08cee0d238..c78424c2b17 100644 --- a/suites/rbd/singleton/all/formatted-output.yaml +++ b/suites/rbd/singleton/all/formatted-output.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - cram: clients: client.0: diff --git a/suites/rbd/singleton/all/merge_diff.yaml b/suites/rbd/singleton/all/merge_diff.yaml index fc58d827b0b..76a999db8f3 100644 --- a/suites/rbd/singleton/all/merge_diff.yaml +++ b/suites/rbd/singleton/all/merge_diff.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/merge_diff.sh] diff --git a/suites/rbd/singleton/all/mirror_image_replay.yaml b/suites/rbd/singleton/all/mirror_image_replay.yaml index 1682b4d83a2..f429cdd754e 100644 --- a/suites/rbd/singleton/all/mirror_image_replay.yaml +++ b/suites/rbd/singleton/all/mirror_image_replay.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/rbd_mirror_image_replay.sh] diff --git a/suites/rbd/singleton/all/permissions.yaml b/suites/rbd/singleton/all/permissions.yaml index 13d7a162dbc..bb7e12b7968 100644 --- a/suites/rbd/singleton/all/permissions.yaml +++ b/suites/rbd/singleton/all/permissions.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/permissions.sh] diff --git a/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml b/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml index 2771d4e8db1..bf67dbab3d1 100644 --- a/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml +++ b/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml @@ -4,6 +4,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: false diff --git a/suites/rbd/singleton/all/qemu-iotests-writeback.yaml b/suites/rbd/singleton/all/qemu-iotests-writeback.yaml index f6768df5a22..823e67202c3 100644 --- a/suites/rbd/singleton/all/qemu-iotests-writeback.yaml +++ b/suites/rbd/singleton/all/qemu-iotests-writeback.yaml @@ -4,6 +4,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: true diff --git a/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml b/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml index 287509e4953..64667d9df29 100644 --- a/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml +++ b/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml @@ -4,6 +4,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: true diff --git a/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml b/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml index f00153f8464..434575d382d 100644 --- a/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml +++ b/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd validate pool: false diff --git a/suites/rbd/singleton/all/rbd_mirror.yaml b/suites/rbd/singleton/all/rbd_mirror.yaml index 272c6410dfa..9caf64464ad 100644 --- a/suites/rbd/singleton/all/rbd_mirror.yaml +++ b/suites/rbd/singleton/all/rbd_mirror.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/test_rbd_mirror.sh] diff --git a/suites/rbd/singleton/all/read-flags-no-cache.yaml b/suites/rbd/singleton/all/read-flags-no-cache.yaml index f7d44456d3b..a28875cc563 100644 --- a/suites/rbd/singleton/all/read-flags-no-cache.yaml +++ b/suites/rbd/singleton/all/read-flags-no-cache.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: false diff --git a/suites/rbd/singleton/all/read-flags-writeback.yaml b/suites/rbd/singleton/all/read-flags-writeback.yaml index f25be79e0b6..4f2bd19a92e 100644 --- a/suites/rbd/singleton/all/read-flags-writeback.yaml +++ b/suites/rbd/singleton/all/read-flags-writeback.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: true diff --git a/suites/rbd/singleton/all/read-flags-writethrough.yaml b/suites/rbd/singleton/all/read-flags-writethrough.yaml index 80d7b4254b6..543a84958de 100644 --- a/suites/rbd/singleton/all/read-flags-writethrough.yaml +++ b/suites/rbd/singleton/all/read-flags-writethrough.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs conf: client: rbd cache: true diff --git a/suites/rbd/singleton/all/verify_pool.yaml b/suites/rbd/singleton/all/verify_pool.yaml index b82b504158b..92b110277ed 100644 --- a/suites/rbd/singleton/all/verify_pool.yaml +++ b/suites/rbd/singleton/all/verify_pool.yaml @@ -3,6 +3,7 @@ roles: tasks: - install: - ceph: + fs: xfs - workunit: clients: all: [rbd/verify_pool.sh]