]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #44282 from orozery/qa-qemu-nbd-ide-interface
authorIlya Dryomov <idryomov@gmail.com>
Tue, 25 Jan 2022 14:06:14 +0000 (15:06 +0100)
committerGitHub <noreply@github.com>
Tue, 25 Jan 2022 14:06:14 +0000 (15:06 +0100)
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>
1  2 
qa/run_xfstests_qemu.sh

index 157f58aa2d503e1f8f71ab702a72a7c91ad19dd8,1b5feadd363a3c570811467a0d98d0ee3e9bfc6e..4849a6c1ef57e88b99814a0e6cc865f14370a7be
@@@ -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