RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/workunits/rbd: use jammy version of qemu-iotests for centos 9

Browse Source 
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>
This commit is contained in:
Ilya Dryomov 2023-07-25 13:31:25 +02:00
parent 6eb1276ce1
commit d49df8d74c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qa/workunits/rbd/qemu-iotests.sh
View File

@ -11,11 +11,9 @@ git clone https://github.com/qemu/qemu.git
cd qemu cd qemu
if grep -iqE '(bionic|focal|jammy)' /etc/os-release; then if grep -iqE '(bionic|focal|jammy|platform:el9)' /etc/os-release; then
# Bionic requires a matching test harness
git checkout v2.11.0 git checkout v2.11.0
elif grep -iqE '(xenial|platform:el8)' /etc/os-release; then elif grep -iqE '(xenial|platform:el8)' /etc/os-release; then
# Xenial requires a recent test harness
git checkout v2.3.0 git checkout v2.3.0
else else
# use v2.2.0-rc3 (last released version that handles all the tests # use v2.2.0-rc3 (last released version that handles all the tests
@ -23,21 +21,19 @@ else
fi fi
cd tests/qemu-iotests cd tests/qemu-iotests
mkdir bin
# qemu-iotests expects a binary called just 'qemu' to be available # qemu-iotests expects a binary called just 'qemu' to be available
if [ -x '/usr/bin/qemu-system-x86_64' ] if [ -x '/usr/bin/qemu-system-x86_64' ]
then then
QEMU='/usr/bin/qemu-system-x86_64' 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 else
QEMU='/usr/libexec/qemu-kvm' QEMU='/usr/libexec/qemu-kvm'
fi 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 # 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 # 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 touch common.env
# TEST_DIR is the pool for rbd # TEST_DIR is the pool for rbd
TEST_DIR=rbd PATH="$PATH:$PWD/bin" ./check -rbd $testlist TEST_DIR=rbd ./check -rbd $testlist
cd ../../.. cd ../../..
rm -rf qemu rm -rf qemu