From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 25 Jan 2022 14:06:14 +0000 (+0100)
Subject: Merge pull request #44282 from orozery/qa-qemu-nbd-ide-interface
X-Git-Tag: v18.0.0~1504
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82219b3beae122f7b93360ca586ba46f4aee5b9a;p=ceph.git

Merge pull request #44282 from orozery/qa-qemu-nbd-ide-interface

qa/tasks/qemu: switch nbd devices from virtio to ide

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
---

82219b3beae122f7b93360ca586ba46f4aee5b9a
diff --cc qa/run_xfstests_qemu.sh
index 157f58aa2d503,1b5feadd363a3..4849a6c1ef57e
--- a/qa/run_xfstests_qemu.sh
+++ b/qa/run_xfstests_qemu.sh
@@@ -13,12 -13,17 +13,21 @@@ SCRIPT="run_xfstests-obsolete.sh
  cd "${TESTDIR}"
  
  wget -O "${SCRIPT}" "${URL_BASE}/${SCRIPT}"
 -chmod +x "${SCRIPT}"
 +# mark executable only if the file isn't empty since ./"${SCRIPT}"
 +# on an empty file would succeed
 +if [[ -s "${SCRIPT}" ]]; then
 +    chmod +x "${SCRIPT}"
 +fi
  
+ TEST_DEV="/dev/vdb"
+ if [[ ! -b "${TEST_DEV}" ]]; then
+     TEST_DEV="/dev/sdb"
+ fi
+ SCRATCH_DEV="/dev/vdc"
+ if [[ ! -b "${SCRATCH_DEV}" ]]; then
+     SCRATCH_DEV="/dev/sdc"
+ fi
+ 
  # tests excluded fail in the current testing vm regardless of whether
  # rbd is used