|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] CI: Refresh OpenSUSE Leap container
commit e85ff1f1af8c298f3f25f226698e670600eff905
Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jul 10 14:37:53 2024 +0100
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jul 12 16:27:28 2024 +0100
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@xxxxxxxxxx>
Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
.../build/opensuse/leap-15.6-x86_64.dockerfile | 79 ++++++++++++++++++++++
automation/build/suse/opensuse-leap.dockerfile | 75 --------------------
automation/gitlab-ci/build.yaml | 16 ++---
automation/scripts/containerize | 2 +-
4 files changed, 88 insertions(+), 84 deletions(-)
diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile
b/automation/build/opensuse/leap-15.6-x86_64.dockerfile
new file mode 100644
index 0000000000..ea70dffe2a
--- /dev/null
+++ b/automation/build/opensuse/leap-15.6-x86_64.dockerfile
@@ -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@xxxxxxxxxxxxxxxxxxxx"
+
+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
diff --git a/automation/build/suse/opensuse-leap.dockerfile
b/automation/build/suse/opensuse-leap.dockerfile
deleted file mode 100644
index 28d3338812..0000000000
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 opensuse/leap
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-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
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index fd6ca1270e..f9a9275ff2 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -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
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index c4f0137021..d8110b1253 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -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
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |