mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
CI: Refresh OpenSUSE Leap container
See prior patch for most discussion. Despite appearing to be a fixed release (and therefore not marked as permitted failure), the dockerfile references the `leap` tag which is rolling in practice. Switch to 15.6 explicitly, for better test stability. Vs tumbleweed, use `zypper update` rather than dist-upgrade, and retain the RomBIOS dependencies; bin86 and dev86. In terms of size, this saves ~700M: registry.gitlab.com/xen-project/xen/opensuse leap-15.6-x86_64 1.33GB registry.gitlab.com/xen-project/xen/suse opensuse-leap 2.05GB Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Anthony PERARD <anthony.perard@vates.tech> Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
Andrew Cooper committed
1 parent
a8bc31be01
commit
e85ff1f1af
4 files changed
+88
-84
No files matched your search
@@ -0,0 +1,79 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM --platform=linux/amd64 opensuse/leap:15.6
|
||||
LABEL maintainer.name="The Xen Project"
|
||||
LABEL maintainer.email="xen-devel@lists.xenproject.org"
|
||||
|
||||
ENV XEN_TARGET_ARCH=x86_64
|
||||
|
||||
RUN <<EOF
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
useradd --create-home user
|
||||
|
||||
zypper refresh
|
||||
zypper update -y --no-recommends
|
||||
|
||||
DEPS=(
|
||||
# Xen
|
||||
bison
|
||||
checkpolicy
|
||||
clang
|
||||
diffutils
|
||||
findutils
|
||||
flex
|
||||
gawk
|
||||
gcc
|
||||
make
|
||||
python3
|
||||
|
||||
# Tools (general)
|
||||
git-core
|
||||
gzip
|
||||
patch
|
||||
perl
|
||||
pkg-config
|
||||
wget
|
||||
# libxenguest dombuilder
|
||||
'pkgconfig(bzip2)'
|
||||
'pkgconfig(libzstd)'
|
||||
'pkgconfig(lzo2)'
|
||||
'pkgconfig(liblzma)'
|
||||
'pkgconfig(zlib)'
|
||||
# libacpi
|
||||
acpica
|
||||
# libxl
|
||||
'pkgconfig(uuid)'
|
||||
'pkgconfig(yajl)'
|
||||
# RomBIOS
|
||||
bin86
|
||||
dev86
|
||||
# Header Check
|
||||
gcc-c++
|
||||
# xentop
|
||||
'pkgconfig(ncurses)'
|
||||
# Python bindings
|
||||
python3-devel
|
||||
python3-setuptools
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# Stubdom (download/extract)
|
||||
bzip2
|
||||
tar
|
||||
|
||||
# Qemu build
|
||||
meson
|
||||
ninja
|
||||
'pkgconfig(glib-2.0)'
|
||||
'pkgconfig(pixman-1)'
|
||||
python3-packaging
|
||||
)
|
||||
|
||||
zypper install -y --no-recommends "${DEPS[@]}"
|
||||
zypper clean -a
|
||||
EOF
|
||||
|
||||
USER user
|
||||
WORKDIR /build
|
||||
@@ -1,75 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM --platform=linux/amd64 opensuse/leap
|
||||
LABEL maintainer.name="The Xen Project" \
|
||||
maintainer.email="xen-devel@lists.xenproject.org"
|
||||
|
||||
ENV USER root
|
||||
|
||||
RUN mkdir /build
|
||||
WORKDIR /build
|
||||
|
||||
RUN zypper ref && zypper up -y --no-recommends
|
||||
RUN zypper install -y --no-recommends \
|
||||
acpica \
|
||||
bc \
|
||||
bin86 \
|
||||
bison \
|
||||
bzip2 \
|
||||
checkpolicy \
|
||||
clang \
|
||||
cmake \
|
||||
dev86 \
|
||||
diffutils \
|
||||
discount \
|
||||
flex \
|
||||
gawk \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
git \
|
||||
ghostscript \
|
||||
glib2-devel \
|
||||
glibc-devel \
|
||||
gzip \
|
||||
hostname \
|
||||
libaio-devel \
|
||||
libbz2-devel \
|
||||
libext2fs-devel \
|
||||
libgnutls-devel \
|
||||
libjpeg62-devel \
|
||||
libnl3-devel \
|
||||
libnuma-devel \
|
||||
libpixman-1-0-devel \
|
||||
libpng16-devel \
|
||||
libssh2-devel \
|
||||
libtasn1-devel \
|
||||
libuuid-devel \
|
||||
libyajl-devel \
|
||||
lzo-devel \
|
||||
make \
|
||||
nasm \
|
||||
ncurses-devel \
|
||||
ocaml \
|
||||
ocaml-findlib-devel \
|
||||
ocaml-ocamlbuild \
|
||||
ocaml-ocamldoc \
|
||||
pandoc \
|
||||
patch \
|
||||
pkg-config \
|
||||
'pkgconfig(libpci)' \
|
||||
'pkgconfig(sdl)' \
|
||||
'pkgconfig(sdl2)' \
|
||||
python3-devel \
|
||||
python3-setuptools \
|
||||
# systemd-devel for Xen < 4.19
|
||||
systemd-devel \
|
||||
tar \
|
||||
transfig \
|
||||
valgrind-devel \
|
||||
wget \
|
||||
which \
|
||||
xz-devel \
|
||||
zlib-devel \
|
||||
# QEMU
|
||||
ninja \
|
||||
&& \
|
||||
zypper clean -a
|
||||
@@ -645,25 +645,25 @@ ubuntu-focal-clang-debug:
|
||||
variables:
|
||||
CONTAINER: ubuntu:focal
|
||||
|
||||
opensuse-leap-clang:
|
||||
opensuse-leap-15.6-clang:
|
||||
extends: .clang-x86-64-build
|
||||
variables:
|
||||
CONTAINER: suse:opensuse-leap
|
||||
CONTAINER: opensuse:leap-15.6-x86_64
|
||||
|
||||
opensuse-leap-clang-debug:
|
||||
opensuse-leap-15.6-clang-debug:
|
||||
extends: .clang-x86-64-build-debug
|
||||
variables:
|
||||
CONTAINER: suse:opensuse-leap
|
||||
CONTAINER: opensuse:leap-15.6-x86_64
|
||||
|
||||
opensuse-leap-gcc:
|
||||
opensuse-leap-15.6-gcc:
|
||||
extends: .gcc-x86-64-build
|
||||
variables:
|
||||
CONTAINER: suse:opensuse-leap
|
||||
CONTAINER: opensuse:leap-15.6-x86_64
|
||||
|
||||
opensuse-leap-gcc-debug:
|
||||
opensuse-leap-15.6-gcc-debug:
|
||||
extends: .gcc-x86-64-build-debug
|
||||
variables:
|
||||
CONTAINER: suse:opensuse-leap
|
||||
CONTAINER: opensuse:leap-15.6-x86_64
|
||||
|
||||
opensuse-tumbleweed-clang:
|
||||
extends: .clang-x86-64-build
|
||||
|
||||
@@ -42,7 +42,7 @@ case "_${CONTAINER}" in
|
||||
_bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;;
|
||||
_bionic) CONTAINER="${BASE}/ubuntu:bionic" ;;
|
||||
_xenial) CONTAINER="${BASE}/ubuntu:xenial" ;;
|
||||
_opensuse-leap|_leap) CONTAINER="${BASE}/suse:opensuse-leap" ;;
|
||||
_opensuse-leap|_leap) CONTAINER="${BASE}/opensuse:leap-15.6-x86_64" ;;
|
||||
_opensuse-tumbleweed|_tumbleweed) CONTAINER="${BASE}/opensuse:tumbleweed-x86_64" ;;
|
||||
esac
|
||||
|
||||
|
||||