Merge pull request #7252 from ceph/wip-13483-hammer

qa: remove legacy OS support from rbd/qemu-iotests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

qa/workunits/rbd/qemu-iotests.sh

@@ -8,41 +8,25 @@
 # This will only work with particular qemu versions, like 1.0. Later
 # versions of qemu include qemu-iotests directly in the qemu
 # repository.
-codevers=`lsb_release -sc`
-iotests=qemu-iotests
-testlist='001 002 003 004 005 008 009 010 011 021 025'
+testlist='001 002 003 004 005 008 009 010 011 021 025 032 033 055 077'
 
-# See if we need to use the iotests suites in qemu (newer version).
-# Right now, trusty is the only version that uses this.
-for chkcode in "trusty"
-do
-    if [ "$chkcode" = "$codevers" ]
-    then
-        iotests=qemu/tests/qemu-iotests
-    fi
-done
-
-if [ "$iotests" = "qemu/tests/qemu-iotests" ]
-then
-    git clone https://github.com/qemu/qemu.git
-    # use v2.2.0-rc3 (last released version that handles all the tests
-    cd qemu
-    git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80
-    cd ..
-    testlist=$testlist' 032 033 055 077'
-else
-    git clone git://git.ceph.com/qemu-iotests.git
-fi
-
-cd "$iotests"
+git clone https://github.com/qemu/qemu.git
+# use v2.2.0-rc3 (last released version that handles all the tests
+cd qemu
+git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80
 
+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'
 else
     QEMU='/usr/libexec/qemu-kvm'
+
+    # disable test 055 since qemu-kvm (RHEL/CentOS) doesn't support the
+    # required QMP commands
+    testlist=$(echo ${testlist} | sed "s/ 055//g")
 fi
 ln -s $QEMU bin/qemu
 
@@ -54,13 +38,5 @@ touch common.env
 # TEST_DIR is the pool for rbd
 TEST_DIR=rbd PATH="$PATH:$PWD/bin" ./check -rbd $testlist
 
-if [ "$iotests" = "qemu/tests/qemu-iotests" ]
-then
-    cd ../../..
-else
-    cd ..
-fi
-
-dname=`echo $iotests | cut -d "/" -f1`
-rm -rf $dname
-
+cd ../../..
+rm -rf qemu