From ea65450c49083f186781a3cbffe6cd24ed3c7a00 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 5 Dec 2016 13:46:02 -0500 Subject: [PATCH] qa/workunits/rbd: use more recent qemu-iotests that support Xenial Fixes: http://tracker.ceph.com/issues/18149 Signed-off-by: Jason Dillaman (cherry picked from commit 4314cb945a9c2296e2f7cd357b09015777f233c0) --- qa/workunits/rbd/qemu-iotests.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh index 8697856d8545..e775ade72c51 100755 --- a/qa/workunits/rbd/qemu-iotests.sh +++ b/qa/workunits/rbd/qemu-iotests.sh @@ -5,15 +5,18 @@ # require the admin ceph user, as there's no way to pass the ceph user # to qemu-iotests currently. -# This will only work with particular qemu versions, like 1.0. Later -# versions of qemu include qemu-iotests directly in the qemu -# repository. testlist='001 002 003 004 005 008 009 010 011 021 025 032 033 055' git clone https://github.com/qemu/qemu.git -# use v2.2.0-rc3 (last released version that handles all the tests cd qemu -git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80 +if lsb_release -da | grep -iq xenial; then + # Xenial requires a recent test harness + git checkout v2.3.0 +else + # use v2.2.0-rc3 (last released version that handles all the tests + git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80 + +fi cd tests/qemu-iotests mkdir bin -- 2.47.3