From c5e4c80c08c9c6a61c33ed96b8a8fadb4d1f3548 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 18 Apr 2019 14:02:45 -0400
Subject: [PATCH] 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)
---
 qa/workunits/rbd/qemu-iotests.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index e775ade72c51b..1cd9c4e00c00b 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'
 
-- 
2.39.5