mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
CI: Rename xenial-xilinx to xilinx-hw-runner
The container is tied to the runner, not a version of Ubuntu. Intentionally give it a generic name so it need not change in the future. Apply standard cleanup to the dockerfile, except that it must continue to be a root container to drive real hardware. Explicitly install ca-certificates to compensate for --no-install-recommends. No practical change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Anthony PERARD <anthony.perard@vates.tech> Acked-by: Stefano Stabellini <sstabellini@kernel.org> Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
1 parent
3ddcb957b5
commit
ffb9c3016b
3 files changed
+34
-29
No files matched your search
@@ -1,27 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM --platform=linux/amd64 ubuntu:16.04
|
||||
LABEL maintainer.name="The Xen Project " \
|
||||
maintainer.email="xen-devel@lists.xenproject.org"
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV USER root
|
||||
|
||||
RUN mkdir /build
|
||||
WORKDIR /build
|
||||
|
||||
# board bringup depends
|
||||
RUN apt-get update && \
|
||||
apt-get --quiet --yes install \
|
||||
snmp \
|
||||
snmp-mibs-downloader \
|
||||
u-boot-tools \
|
||||
device-tree-compiler \
|
||||
cpio \
|
||||
git \
|
||||
gzip \
|
||||
file \
|
||||
expect \
|
||||
&& \
|
||||
apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
|
||||
@@ -0,0 +1,32 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM --platform=linux/amd64 ubuntu:16.04
|
||||
LABEL maintainer.name="The Xen Project"
|
||||
LABEL maintainer.email="xen-devel@lists.xenproject.org"
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN <<EOF
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
apt-get update
|
||||
|
||||
DEPS=(
|
||||
ca-certificates
|
||||
cpio
|
||||
device-tree-compiler
|
||||
expect
|
||||
file
|
||||
git
|
||||
gzip
|
||||
snmp
|
||||
snmp-mibs-downloader
|
||||
u-boot-tools
|
||||
)
|
||||
|
||||
apt-get -y --no-install-recommends install "${DEPS[@]}"
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
EOF
|
||||
|
||||
USER root
|
||||
WORKDIR /build
|
||||
@@ -105,7 +105,7 @@
|
||||
.xilinx-arm64:
|
||||
extends: .test-jobs-common
|
||||
variables:
|
||||
CONTAINER: ubuntu:xenial-xilinx
|
||||
CONTAINER: ubuntu:xilinx-hw-runner
|
||||
LOGFILE: qemu-smoke-xilinx.log
|
||||
TEST_TIMEOUT_OVERRIDE: 120
|
||||
artifacts:
|
||||
@@ -124,7 +124,7 @@
|
||||
.xilinx-x86_64:
|
||||
extends: .test-jobs-common
|
||||
variables:
|
||||
CONTAINER: ubuntu:xenial-xilinx
|
||||
CONTAINER: ubuntu:xilinx-hw-runner
|
||||
LOGFILE: xilinx-smoke-x86_64.log
|
||||
XEN_CMD_CONSOLE: "console=com2 com2=57600,8n1,0x2F8,4"
|
||||
TEST_BOARD: "crater"
|
||||
|
||||