Skip to content

Commit

Permalink
qa/workunits/rbd: use more recent qemu-iotests that support Bionic
Browse files Browse the repository at this point in the history
Fixes: http://tracker.ceph.com/issues/24668
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b184acd)
  • Loading branch information
Jason Dillaman committed May 3, 2019
1 parent c1d909d commit c5e4c80
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions qa/workunits/rbd/qemu-iotests.sh
Expand Up @@ -9,13 +9,15 @@ 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 | grep -iq xenial; then
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
# 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
git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80

fi

cd tests/qemu-iotests
Expand All @@ -24,6 +26,12 @@ mkdir bin
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'

Expand Down

0 comments on commit c5e4c80

Please sign in to comment.