|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 5/7] CI: Update the Alpine arm64 container to 3.24
Perform standard syntax cleanup and make it a non-root container. Switch yajl
for json-c given the deprecation of the former. Drop dev86 which is an
x86-only dependency, and QEMU dependencies as we don't build QEMU in this
environment any more.
When updating the job names, also rename some for consistency so the arm64
fragment comes before the compiler.
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Michal Orzel <michal.orzel@xxxxxxx>
CC: Doug Goldstein <cardoe@xxxxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
Requires the test-artefacts change to add alpine-3.24-arm64-rootfs
---
.../build/alpine/3.18-arm64v8.dockerfile | 51 ------------------
.../build/alpine/3.24-arm64v8.dockerfile | 53 +++++++++++++++++++
automation/gitlab-ci/build.yaml | 32 +++++------
automation/gitlab-ci/test.yaml | 30 +++++------
4 files changed, 84 insertions(+), 82 deletions(-)
delete mode 100644 automation/build/alpine/3.18-arm64v8.dockerfile
create mode 100644 automation/build/alpine/3.24-arm64v8.dockerfile
diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile
b/automation/build/alpine/3.18-arm64v8.dockerfile
deleted file mode 100644
index b8482d5bf43f..000000000000
--- a/automation/build/alpine/3.18-arm64v8.dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/arm64/v8 alpine:3.18
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apk --no-cache add \
- \
- # xen build deps
- argp-standalone \
- autoconf \
- bash \
- bison \
- curl \
- dev86 \
- dtc-dev \
- flex \
- gcc \
- git \
- iasl \
- libaio-dev \
- libfdt \
- linux-headers \
- make \
- musl-dev \
- ncurses-dev \
- ocaml \
- ocaml-findlib \
- patch \
- python3-dev \
- py3-setuptools \
- texinfo \
- util-linux-dev \
- xz-dev \
- yajl-dev \
- zlib-dev \
- \
- # qemu build deps
- glib-dev \
- libattr \
- libcap-ng-dev \
- pixman-dev \
- # qubes test deps
- openssh-client \
- fakeroot \
- expect \
diff --git a/automation/build/alpine/3.24-arm64v8.dockerfile
b/automation/build/alpine/3.24-arm64v8.dockerfile
new file mode 100644
index 000000000000..5b28d874efae
--- /dev/null
+++ b/automation/build/alpine/3.24-arm64v8.dockerfile
@@ -0,0 +1,53 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/arm64/v8 alpine:3.24
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+RUN apk --no-cache add bash
+
+RUN <<EOF
+#!/bin/bash
+ set -eu
+
+ adduser -D user
+
+ DEPS=(
+ # Xen
+ bison
+ flex
+ g++
+ gcc
+ make
+
+ # Tools (general)
+ argp-standalone
+ autoconf
+ git
+ linux-headers
+ patch
+ # libxenguest dombuilder
+ bzip2-dev
+ xz-dev
+ zlib-dev
+ zstd-dev
+ # libacpi
+ iasl
+ # libxl
+ dtc-dev
+ json-c-dev
+ util-linux-dev
+ # xentop
+ ncurses-dev
+ # Python bindings
+ python3-dev
+ py3-setuptools
+ # Ocaml bindings/oxenstored
+ ocaml
+ ocaml-findlib
+ )
+
+ apk add --no-cache "${DEPS[@]}"
+EOF
+
+USER user
+WORKDIR /build
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index e295f4d4f25f..fa054a82800b 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -401,68 +401,68 @@ debian-13-arm64-gcc-debug:
variables:
CONTAINER: debian:13-arm64v8
-alpine-3.18-gcc-arm64:
+alpine-3.24-arm64-gcc:
extends: .gcc-arm64-build
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
-alpine-3.18-gcc-debug-arm64:
+alpine-3.24-arm64-gcc-debug:
extends: .gcc-arm64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
EXTRA_XEN_CONFIG: |
CONFIG_UBSAN=y
CONFIG_UBSAN_FATAL=y
-alpine-3.18-gcc-arm64-randconfig:
+alpine-3.24-arm64-gcc-randconfig:
extends: .gcc-arm64-build
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
RANDCONFIG: y
-alpine-3.18-gcc-debug-arm64-staticmem:
+alpine-3.24-arm64-gcc-debug-staticmem:
extends: .gcc-arm64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
EXTRA_XEN_CONFIG: |
CONFIG_EXPERT=y
CONFIG_UNSUPPORTED=y
CONFIG_STATIC_MEMORY=y
-alpine-3.18-gcc-debug-arm64-static-shared-mem:
+alpine-3.24-arm64-gcc-debug-static-shared-mem:
extends: .gcc-arm64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
EXTRA_XEN_CONFIG: |
CONFIG_UNSUPPORTED=y
CONFIG_STATIC_MEMORY=y
CONFIG_STATIC_SHM=y
-alpine-3.18-gcc-debug-arm64-boot-cpupools:
+alpine-3.24-arm64-gcc-debug-boot-cpupools:
extends: .gcc-arm64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
EXTRA_XEN_CONFIG: |
CONFIG_BOOT_TIME_CPUPOOLS=y
-alpine-3.18-gcc-debug-arm64-earlyprintk:
+alpine-3.24-arm64-gcc-debug-earlyprintk:
extends: .gcc-arm64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
EXTRA_XEN_CONFIG: |
CONFIG_EARLY_UART_CHOICE_PL011=y
CONFIG_EARLY_UART_BASE_ADDRESS=0x9000000
-alpine-3.18-gcc-debug-arm64-mpu:
+alpine-3.24-arm64-gcc-debug-mpu:
extends: .gcc-arm64-build-debug
variables:
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:3.24-arm64v8
HYPERVISOR_ONLY: y
EXTRA_XEN_CONFIG: |
CONFIG_XEN_START_ADDRESS=0x0
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index b651efef1593..2a7a0e513e72 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -10,7 +10,7 @@
job: $LINUX_JOB_ARM64
ref: $ARTIFACTS_BRANCH
- project: $ARTIFACTS_REPO
- job: alpine-3.18-arm64-rootfs
+ job: alpine-3.24-arm64-rootfs
ref: $ARTIFACTS_BRANCH
.arm32-test-needs: &arm32-test-needs
@@ -220,7 +220,7 @@ xilinx-smoke-dom0less-arm64-gcc-debug:
- ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough:
extends: .xilinx-arm64
@@ -228,7 +228,7 @@ xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough:
- ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1
| tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
xilinx-smoke-dom0-x86_64-gcc-debug:
extends: .xilinx-x86_64
@@ -494,7 +494,7 @@ qemu-smoke-dom0-arm64-gcc:
- ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-arm64
+ - alpine-3.24-arm64-gcc
qemu-smoke-dom0-arm64-gcc-debug:
extends: .qemu-arm64
@@ -502,7 +502,7 @@ qemu-smoke-dom0-arm64-gcc-debug:
- ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
qemu-smoke-dom0less-arm64-gcc:
extends: .qemu-arm64
@@ -510,7 +510,7 @@ qemu-smoke-dom0less-arm64-gcc:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-arm64
+ - alpine-3.24-arm64-gcc
qemu-smoke-dom0less-arm64-gcc-debug:
extends: .qemu-arm64
@@ -518,7 +518,7 @@ qemu-smoke-dom0less-arm64-gcc-debug:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
qemu-smoke-dom0less-arm64-gcc-debug-gicv3:
extends: .qemu-arm64
@@ -526,7 +526,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-gicv3:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh gicv3 2>&1 | tee
${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
qemu-smoke-dom0less-arm64-gcc-debug-staticmem:
extends: .qemu-arm64
@@ -534,7 +534,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticmem:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee
${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64-staticmem
+ - alpine-3.24-arm64-gcc-debug-staticmem
qemu-smoke-dom0less-arm64-gcc-debug-staticheap:
extends: .qemu-arm64
@@ -542,7 +542,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticheap:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee
${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem:
extends: .qemu-arm64
@@ -550,7 +550,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1
| tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64-static-shared-mem
+ - alpine-3.24-arm64-gcc-debug-static-shared-mem
qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools:
extends: .qemu-arm64
@@ -558,7 +558,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 |
tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64-boot-cpupools
+ - alpine-3.24-arm64-gcc-debug-boot-cpupools
qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk:
extends: .qemu-arm64
@@ -566,7 +566,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk:
- ./automation/scripts/qemu-smoke-dom0less-arm64.sh earlyprintk 2>&1 | tee
${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64-earlyprintk
+ - alpine-3.24-arm64-gcc-debug-earlyprintk
qemu-xtf-dom0less-arm64-gcc-hyp-xen-version:
extends: .qemu-arm64
@@ -574,7 +574,7 @@ qemu-xtf-dom0less-arm64-gcc-hyp-xen-version:
- ./automation/scripts/qemu-xtf.sh arm64 mmu64le hyp-xen-version 2>&1 |
tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-arm64
+ - alpine-3.24-arm64-gcc
qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version:
extends: .qemu-arm64
@@ -582,7 +582,7 @@ qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version:
- ./automation/scripts/qemu-xtf.sh arm64 mmu64le hyp-xen-version 2>&1 |
tee ${LOGFILE}
needs:
- *arm64-test-needs
- - alpine-3.18-gcc-debug-arm64
+ - alpine-3.24-arm64-gcc-debug
qemu-smoke-dom0-arm32-gcc:
extends: .qemu-arm32
--
2.39.5
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |