From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 16 Jan 2020 16:39:32 +0000 (-0500)
Subject: qa/workunits/rbd: use more recent qemu-iotests that support EL8
X-Git-Tag: v15.1.0~169^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cefaa78186f5d1311831a67ac340992400cca475;p=ceph.git

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

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index 1cd9c4e00c00..ddb63dae3b5d 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -12,7 +12,7 @@ cd qemu
 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
+elif lsb_release -da 2>&1 | grep -iqE '(xenial|linux release 8)'; then
     # Xenial requires a recent test harness
     git checkout v2.3.0
 else
@@ -36,7 +36,8 @@ else
     QEMU='/usr/libexec/qemu-kvm'
 
     # disable test 055 since qemu-kvm (RHEL/CentOS) doesn't support the
-    # required QMP commands
+    # required QMP commands under EL7 and Python 3 is not supported by
+    # the test under EL8
     testlist=$(echo ${testlist} | sed "s/ 055//g")
 fi
 ln -s $QEMU bin/qemu