From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 18 Apr 2019 18:02:45 +0000 (-0400)
Subject: qa/workunits/rbd: use more recent qemu-iotests that support Bionic
X-Git-Tag: v13.2.6~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5e4c80c08c9c6a61c33ed96b8a8fadb4d1f3548;p=ceph.git

qa/workunits/rbd: use more recent qemu-iotests that support Bionic

Fixes: http://tracker.ceph.com/issues/24668
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b184acd218b36b85f5a25678d773c35407a2b745)
---

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index e775ade72c51..1cd9c4e00c00 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -9,13 +9,15 @@ testlist='001 002 003 004 005 008 009 010 011 021 025 032 033 055'
 
 git clone https://github.com/qemu/qemu.git
 cd qemu
-if lsb_release -da | grep -iq xenial; then
+if lsb_release -da 2>&1 | grep -iq 'bionic'; then
+    # Bionic requires a matching test harness
+    git checkout v2.11.0
+elif lsb_release -da 2>&1 | 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
@@ -24,6 +26,12 @@ mkdir bin
 if [ -x '/usr/bin/qemu-system-x86_64' ]
 then
     QEMU='/usr/bin/qemu-system-x86_64'
+
+    # Bionic (v2.11.0) tests expect all tools in current directory
+    ln -s $QEMU qemu
+    ln -s /usr/bin/qemu-img
+    ln -s /usr/bin/qemu-io
+    ln -s /usr/bin/qemu-nbd
 else
     QEMU='/usr/libexec/qemu-kvm'