From: Ilya Dryomov <idryomov@gmail.com>
Date: Sun, 2 May 2021 21:13:29 +0000 (+0200)
Subject: qa/workunits/rbd: use bionic version of qemu-iotests for focal
X-Git-Tag: v16.2.5~118^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cff34d6af0530522b785e6739530b9c6e5946de1;p=ceph.git

qa/workunits/rbd: use bionic version of qemu-iotests for focal

Currently Focal ends up with v2.2.0-rc3, which results in "WARNING:
Image format was not specified for ..." for all tests and all tests
fail.

Fixes: https://tracker.ceph.com/issues/50605
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 2de2146c300c9f1b49944ffe13cc249a95bca19a)
---

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index ddb63dae3b5..13af2debd8e 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -9,7 +9,7 @@ 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 2>&1 | grep -iq 'bionic'; then
+if lsb_release -da 2>&1 | grep -iqE '(bionic|focal)'; then
     # Bionic requires a matching test harness
     git checkout v2.11.0
 elif lsb_release -da 2>&1 | grep -iqE '(xenial|linux release 8)'; then