From: Anthony PERARD Date: Thu, 30 Sep 2021 16:17:20 +0000 (+0100) Subject: automation: Add qemu to debian:stretch container for smoke test X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~143 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c9aa02e48eda5378c19f3837e6c21bcaab1dcad5;p=xen.git automation: Add qemu to debian:stretch container for smoke test We can add qemu into the container so that there's no need to install it everytime we run a test. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index e2ee14e201..da6aa874dd 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -47,6 +47,8 @@ RUN apt-get update && \ nasm \ gnupg \ apt-transport-https \ + # for test phase, qemu-smoke-* jobs + qemu-system-x86 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 29cb44b757..188ff8e3d6 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -5,11 +5,6 @@ set -ex # variant should be either pv or pvh variant=$1 -# Install QEMU -export DEBIAN_FRONTENT=noninteractive -apt-get -qy update -apt-get -qy install qemu-system-x86 - # Clone and build XTF git clone https://xenbits.xen.org/git-http/xtf.git cd xtf && make -j$(nproc) && cd -