From 2136d88cd61add64c5094a16a260ceb7473bdd57 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 1 Aug 2019 14:31:21 +0300 Subject: [PATCH] Use qemu-kvm in tests instead of qemu-system Related: rhbz#1698366 --- test/vm.install | 4 ---- tests/cli/test_compose_live-iso.sh | 2 +- tests/cli/test_compose_qcow2.sh | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/vm.install b/test/vm.install index 28f79a62..9c82a425 100755 --- a/test/vm.install +++ b/test/vm.install @@ -41,10 +41,6 @@ if ! rpm -q git; then yum install -y git fi -if ! rpm -q qemu-system-x86; then - yum install -y qemu-system-x86 -fi - # Grow root partition to make room for images. This only works on Fedora right now. parted --script /dev/vda resizepart 2 100% partprobe diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh index b9c037e7..7fb8b40f 100755 --- a/tests/cli/test_compose_live-iso.sh +++ b/tests/cli/test_compose_live-iso.sh @@ -13,7 +13,7 @@ set -e . $(dirname $0)/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU_BIN="/usr/bin/qemu-system-$(uname -m)" +QEMU_BIN="/usr/libexec/qemu-kvm" QEMU="$QEMU_BIN -machine accel=kvm:tcg" rlJournalStart diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh index e61b209b..ac7a88cf 100755 --- a/tests/cli/test_compose_qcow2.sh +++ b/tests/cli/test_compose_qcow2.sh @@ -13,7 +13,7 @@ set -e . $(dirname $0)/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU_BIN="/usr/bin/qemu-system-$(uname -m)" +QEMU_BIN="/usr/libexec/qemu-kvm" QEMU="$QEMU_BIN -machine accel=kvm:tcg" rlJournalStart