diff options
| author | Anthony PERARD <anthony.perard@gmail.com> | 2021-09-30 17:17:20 +0100 |
|---|---|---|
| committer | Andrew Cooper <andrew.cooper3@citrix.com> | 2021-10-01 09:52:14 +0100 |
| commit | c9aa02e48eda5378c19f3837e6c21bcaab1dcad5 (patch) | |
| tree | 3fb2a57bd5f981edd03c7527cc25e67c3ec78421 | |
| parent | 5d15f905b9252d801101af0279fbedb0c50dc241 (diff) | |
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 <anthony.perard@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
| -rw-r--r-- | automation/build/debian/stretch.dockerfile | 2 | ||||
| -rwxr-xr-x | automation/scripts/qemu-smoke-x86-64.sh | 5 |
2 files changed, 2 insertions, 5 deletions
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 - |