From 42f00487b9c67272fa0bfcd3404fd2fafc3bc555 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 14 Jan 2021 11:52:05 -0500 Subject: [PATCH] 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 --- qa/workunits/rbd/cli_migration.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/qa/workunits/rbd/cli_migration.sh b/qa/workunits/rbd/cli_migration.sh index 63ceeb14e3b2d..9e90998503708 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 <