From d49df8d74ca96a3c0fc00f1d7e303d4e12f2f1e3 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 25 Jul 2023 13:31:25 +0200
Subject: [PATCH] qa/workunits/rbd: use jammy version of qemu-iotests for
 centos 9

It's the one we are using for all recent distros.

While at it, get rid of custom bin directory -- it appears that both
v2.3.0 and v2.11.0 tests are happy with just symlinks in the current
directory.

Fixes: https://tracker.ceph.com/issues/61565
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
 qa/workunits/rbd/qemu-iotests.sh | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
index b723fa26d80..a2e9e0600d4 100755
--- a/qa/workunits/rbd/qemu-iotests.sh
+++ b/qa/workunits/rbd/qemu-iotests.sh
@@ -11,11 +11,9 @@ git clone https://github.com/qemu/qemu.git
 cd qemu
 
 
-if grep -iqE '(bionic|focal|jammy)' /etc/os-release; then
-    # Bionic requires a matching test harness
+if grep -iqE '(bionic|focal|jammy|platform:el9)' /etc/os-release; then
     git checkout v2.11.0
 elif grep -iqE '(xenial|platform:el8)' /etc/os-release; 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
@@ -23,21 +21,19 @@ else
 fi
 
 cd tests/qemu-iotests
-mkdir bin
 # qemu-iotests expects a binary called just 'qemu' to be available
 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'
 fi
-ln -s $QEMU bin/qemu
+
+# 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
 
 # this is normally generated by configure, but has nothing but a python
 # binary definition, which we don't care about.  for some reason it is
@@ -45,7 +41,7 @@ ln -s $QEMU bin/qemu
 touch common.env
 
 # TEST_DIR is the pool for rbd
-TEST_DIR=rbd PATH="$PATH:$PWD/bin" ./check -rbd $testlist
+TEST_DIR=rbd ./check -rbd $testlist
 
 cd ../../..
 rm -rf qemu