From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 14 Jan 2021 16:52:05 +0000 (-0500)
Subject: qa/workunits/rbd: simplify QCOW migration distro check
X-Git-Tag: v16.1.0~18^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42f00487b9c67272fa0bfcd3404fd2fafc3bc555;p=ceph.git

qa/workunits/rbd: simplify QCOW migration distro check

If the qemu-img command fails when attempting to use the QCOW (v1) format,
assume that the distro does not have support for the format enabled.

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

diff --git a/qa/workunits/rbd/cli_migration.sh b/qa/workunits/rbd/cli_migration.sh
index 63ceeb14e3b2..9e9099850370 100755
--- a/qa/workunits/rbd/cli_migration.sh
+++ b/qa/workunits/rbd/cli_migration.sh
@@ -142,19 +142,13 @@ EOF
 }
 
 test_import_qcow_format() {
-    case "$(lsb_release --id --short)" in
-    RedHatEnterpriseWorkstation|RedHatEnterpriseServer|RedHatEnterprise|CentOS)
-        # QCOW format not included in EL variants
-        return
-        ;;
-    *)
-        ;;
-    esac
-
     local base_image=$1
     local dest_image=$2
 
-    qemu-img convert -f raw -O qcow rbd:rbd/${base_image} ${TEMPDIR}/${base_image}.qcow
+    if ! qemu-img convert -f raw -O qcow rbd:rbd/${base_image} ${TEMPDIR}/${base_image}.qcow; then
+        echo "skipping QCOW test"
+        return 0
+    fi
     qemu-img info -f qcow ${TEMPDIR}/${base_image}.qcow
 
     cat > ${TEMPDIR}/spec.json <<EOF