From: Ilya Dryomov <idryomov@gmail.com>
Date: Sun, 2 May 2021 21:13:29 +0000 (+0200)
Subject: qa/workunits/rbd: disable qemu-iotest test 055 globally
X-Git-Tag: v15.2.14~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c64dd72f0f2d77297a4d579b6d1f38ad2763d23a;p=ceph.git

qa/workunits/rbd: disable qemu-iotest test 055 globally

It doesn't work on Focal and already disabled on CentOS 7 and 8.  More
importantly, it doesn't actually test rbd -- it always tests "file", no
matter which protocol is specified in IMGPROTO.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 602db5e386b4acb4f827866bf3789629aacf8307)
---

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index 13af2debd8e..1f13da9fc09 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -5,7 +5,7 @@
 # require the admin ceph user, as there's no way to pass the ceph user
 # to qemu-iotests currently.
 
-testlist='001 002 003 004 005 008 009 010 011 021 025 032 033 055'
+testlist='001 002 003 004 005 008 009 010 011 021 025 032 033'
 
 git clone https://github.com/qemu/qemu.git
 cd qemu
@@ -34,11 +34,6 @@ then
     ln -s /usr/bin/qemu-nbd
 else
     QEMU='/usr/libexec/qemu-kvm'
-
-    # disable test 055 since qemu-kvm (RHEL/CentOS) doesn't support the
-    # 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