* [PATCH for-4.22 0/7] CI: Refresh Alpine containers
@ 2026-06-12 23:09 Andrew Cooper
2026-06-12 23:09 ` [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive Andrew Cooper
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
Refresh and update the Alpine containers.
https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2598243590
This gets us off an obsolete version of Alpine, and finishes several
improvement projects (naming, and non-root containers) all at once.
Andrew Cooper (7):
tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive
Config.mk: Update QEMU to include pip-25.2 bugfix
CI: Introduce new qubes-hw-runner.dockerfile
CI: Update the Alpine x86_64 container to 3.24
CI: Update the Alpine arm64 container to 3.24
CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32}
CI: Remove x86 microcode from arm32 jobs
Config.mk | 4 +-
.../build/alpine/3.18-arm64v8.dockerfile | 51 ---
automation/build/alpine/3.18.dockerfile | 52 ---
.../build/alpine/3.24-arm64v8.dockerfile | 53 +++
.../build/alpine/3.24-x86_64.dockerfile | 65 +++
.../build/alpine/qubes-hw-runner.dockerfile | 21 +
automation/gitlab-ci/build.yaml | 202 ++++-----
automation/gitlab-ci/test.yaml | 385 +++++++++---------
automation/scripts/containerize | 2 +-
.../{xtf-x86-64-config => xtf-x86_64-config} | 0
...86-64-efi-config => xtf-x86_64-efi-config} | 0
.../include/{xtf-x86-64 => xtf-x86_64} | 0
.../{xtf-x86-64-efi => xtf-x86_64-efi} | 0
.../{qubes-x86-64.sh => qubes-x86_64.sh} | 0
tools/xentrace/xenalyze.c | 11 +
15 files changed, 444 insertions(+), 402 deletions(-)
delete mode 100644 automation/build/alpine/3.18-arm64v8.dockerfile
delete mode 100644 automation/build/alpine/3.18.dockerfile
create mode 100644 automation/build/alpine/3.24-arm64v8.dockerfile
create mode 100644 automation/build/alpine/3.24-x86_64.dockerfile
create mode 100644 automation/build/alpine/qubes-hw-runner.dockerfile
rename automation/scripts/include/configs/{xtf-x86-64-config => xtf-x86_64-config} (100%)
rename automation/scripts/include/configs/{xtf-x86-64-efi-config => xtf-x86_64-efi-config} (100%)
rename automation/scripts/include/{xtf-x86-64 => xtf-x86_64} (100%)
rename automation/scripts/include/{xtf-x86-64-efi => xtf-x86_64-efi} (100%)
rename automation/scripts/{qubes-x86-64.sh => qubes-x86_64.sh} (100%)
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 2/7] Config.mk: Update QEMU to include pip-25.2 bugfix Andrew Cooper
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
I don't particularly like this, but I see no better option. It's clearly some
kind of VRA failure, yet we don't see it with GCC 15 in other distros. I
suspect that Musl (as opposed to glibc) might be relevant, and perhaps even as
simple as not realising that error() is terminal for a non-zero input.
---
tools/xentrace/xenalyze.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c
index 876d59d42ca5..cec1354cf779 100644
--- a/tools/xentrace/xenalyze.c
+++ b/tools/xentrace/xenalyze.c
@@ -3789,6 +3789,17 @@ void update_io_address(struct io_address ** list, unsigned int pa, int dir,
error(ERR_SYSTEM, NULL);
}
+ /*
+ * GCC 15.2 in Alpine Linux 3.24 fails with -Werror=nonnull,
+ * complaining that we're calling bzero(NULL, 128).
+ *
+ * This looks to be a false positive as p being NULL will never reach
+ * here as the error() above will have called exit().
+ *
+ * Work around this by hiding the NULL-ness of p from the compiler.
+ */
+ asm ("" : "+r" (p));
+
bzero(p, sizeof(*p));
p->pa=pa;
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/7] Config.mk: Update QEMU to include pip-25.2 bugfix
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
2026-06-12 23:09 ` [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 3/7] CI: Introduce new qubes-hw-runner.dockerfile Andrew Cooper
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
Specifically:
commit 6ad034e71232c2929ed546304c9d249312bb632f
Author: Sv. Lockal <lockalsash@gmail.com>
Date: Mon Aug 11 20:01:59 2025
mkvenv: Support pip 25.2
Fix compilation with pip-25.2 due to missing distlib.version
Bug: https://gitlab.com/qemu-project/qemu/-/issues/3062
which cherrypicks cleanly onto qemu-xen.git master
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This needs putting into main qemu-xen.git first, and then the override of
QEMU_UPSTREAM_URL dropping.
---
Config.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config.mk b/Config.mk
index 86a4999246d1..11fb39154b73 100644
--- a/Config.mk
+++ b/Config.mk
@@ -213,8 +213,8 @@ endif
OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git
OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16
-QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git
-QEMU_UPSTREAM_REVISION ?= e064f42c80be6f6ff8c12dcb2a663bdf70f965f6
+QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/people/andrewcoop/qemu-xen.git
+QEMU_UPSTREAM_REVISION ?= 8ac4f8f52db8943ca389f6040d61d4d98a4c072c
MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git
MINIOS_UPSTREAM_REVISION ?= b6f79f5f44cf69044079c042b88fe9d75367642e
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/7] CI: Introduce new qubes-hw-runner.dockerfile
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
2026-06-12 23:09 ` [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive Andrew Cooper
2026-06-12 23:09 ` [PATCH 2/7] Config.mk: Update QEMU to include pip-25.2 bugfix Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 4/7] CI: Update the Alpine x86_64 container to 3.24 Andrew Cooper
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
This container is tied to gitlab-runner environment in the RPis driving the
test systems, not a specific version of Alpine. Intentionally give it a
generic name so it need not change in the future.
Switch to Alpine 3.24 right away, as it doesn't interact with the 3.18 builds
under test.
The container needs to remain a root container. By no longer using the
arm64v8 build container for dual-purpose, we can finally make the build
containers be non-root.
No practical change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Posted previously, part of the prior CI series.
---
.../build/alpine/qubes-hw-runner.dockerfile | 21 +++++++++++++++++++
automation/gitlab-ci/test.yaml | 2 +-
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 automation/build/alpine/qubes-hw-runner.dockerfile
diff --git a/automation/build/alpine/qubes-hw-runner.dockerfile b/automation/build/alpine/qubes-hw-runner.dockerfile
new file mode 100644
index 000000000000..8b111648721d
--- /dev/null
+++ b/automation/build/alpine/qubes-hw-runner.dockerfile
@@ -0,0 +1,21 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/arm64/v8 alpine:3.24
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@lists.xenproject.org"
+
+RUN apk --no-cache add bash
+
+RUN <<EOF
+#!/bin/bash
+ set -eu
+
+ DEPS=(
+ expect
+ openssh-client
+ )
+
+ apk add --no-cache "${DEPS[@]}"
+EOF
+
+USER root
+WORKDIR /build
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 89760b24e63a..70bb4bbb3b45 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -145,7 +145,7 @@
extends: .test-jobs-common
variables:
# the test controller runs on RPi4
- CONTAINER: alpine:3.18-arm64v8
+ CONTAINER: alpine:qubes-hw-runner
LOGFILE: smoke-test.log
PCIDEV: "03:00.0"
PCIDEV_INTR: "MSI-X"
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/7] CI: Update the Alpine x86_64 container to 3.24
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
` (2 preceding siblings ...)
2026-06-12 23:09 ` [PATCH 3/7] CI: Introduce new qubes-hw-runner.dockerfile Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 5/7] CI: Update the Alpine arm64 " Andrew Cooper
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
Perform standard syntax cleanup and make it a non-root container. Switch yajl
for json-c given the deprecation of the former.
Add an x86_64 suffix for naming consistency with everything else.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Requires the test-artefacts change to add alpine-3.24-x86_64-rootfs
---
automation/build/alpine/3.18.dockerfile | 52 ---------------
.../build/alpine/3.24-x86_64.dockerfile | 65 ++++++++++++++++++
automation/gitlab-ci/build.yaml | 16 ++---
automation/gitlab-ci/test.yaml | 66 +++++++++----------
automation/scripts/containerize | 2 +-
5 files changed, 107 insertions(+), 94 deletions(-)
delete mode 100644 automation/build/alpine/3.18.dockerfile
create mode 100644 automation/build/alpine/3.24-x86_64.dockerfile
diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile
deleted file mode 100644
index 263e9e90d888..000000000000
--- a/automation/build/alpine/3.18.dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 alpine:3.18
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@lists.xenproject.org"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apk --no-cache add \
- \
- # xen build deps
- argp-standalone \
- autoconf \
- bash \
- bison \
- clang \
- curl \
- dev86 \
- flex \
- g++ \
- gcc \
- git \
- grep \
- iasl \
- libaio-dev \
- libc6-compat \
- 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 \
- ninja \
- pixman-dev \
- # livepatch-tools deps
- elfutils-dev \
diff --git a/automation/build/alpine/3.24-x86_64.dockerfile b/automation/build/alpine/3.24-x86_64.dockerfile
new file mode 100644
index 000000000000..f93158e0186d
--- /dev/null
+++ b/automation/build/alpine/3.24-x86_64.dockerfile
@@ -0,0 +1,65 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/amd64 alpine:3.24
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@lists.xenproject.org"
+
+RUN apk --no-cache add bash
+
+RUN <<EOF
+#!/bin/bash
+ set -eu
+
+ adduser -D user
+
+ DEPS=(
+ # Xen
+ bison
+ clang
+ 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
+ util-linux-dev
+ json-c-dev
+ # RomBIOS
+ dev86
+ # xentop
+ ncurses-dev
+ # Python bindings
+ python3-dev
+ py3-setuptools
+ # Ocaml bindings/oxenstored
+ ocaml
+ ocaml-findlib
+
+ # QEMU
+ glib-dev
+ libattr
+ libcap-ng-dev
+ ninja
+ pixman-dev
+
+ # livepatch-tools deps
+ elfutils-dev
+ )
+
+ 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 9eda40dc6e57..e295f4d4f25f 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -270,17 +270,17 @@
# Build jobs needed for tests
-alpine-3.18-gcc:
+alpine-3.24-x86_64-gcc:
extends: .gcc-x86-64-build
<<: *build-test
variables:
- CONTAINER: alpine:3.18
+ CONTAINER: alpine:3.24-x86_64
-alpine-3.18-gcc-debug:
+alpine-3.24-x86_64-gcc-debug:
extends: .gcc-x86-64-build-debug
<<: *build-test
variables:
- CONTAINER: alpine:3.18
+ CONTAINER: alpine:3.24-x86_64
BUILD_QEMU_XEN: y
EXTRA_XEN_CONFIG: |
CONFIG_EXPERT=y
@@ -513,15 +513,15 @@ debian-12-arm64-gcc-cppcheck:
# Build jobs not needed for tests
-alpine-3.18-clang:
+alpine-3.24-x86_64-clang:
extends: .clang-x86-64-build
variables:
- CONTAINER: alpine:3.18
+ CONTAINER: alpine:3.24-x86_64
-alpine-3.18-clang-debug:
+alpine-3.24-x86_64-clang-debug:
extends: .clang-x86-64-build-debug
variables:
- CONTAINER: alpine:3.18
+ CONTAINER: alpine:3.24-x86_64
archlinux-x86_64-gcc:
extends: .gcc-x86-64-build
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 70bb4bbb3b45..b651efef1593 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -26,7 +26,7 @@
job: $LINUX_JOB_X86_64
ref: $ARTIFACTS_BRANCH
- project: $ARTIFACTS_REPO
- job: alpine-3.18-x86_64-rootfs
+ job: alpine-3.24-x86_64-rootfs
ref: $ARTIFACTS_BRANCH
- project: $ARTIFACTS_REPO
job: microcode-x86
@@ -236,19 +236,19 @@ xilinx-smoke-dom0-x86_64-gcc-debug:
- ./automation/scripts/xilinx-smoke-dom0-x86_64.sh ping 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
xilinx-smoke-dom0-x86_64-gcc-debug-argo:
extends: .xilinx-x86_64
script:
- ./automation/scripts/xilinx-smoke-dom0-x86_64.sh argo 2>&1 | tee ${LOGFILE}
needs:
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
- project: xen-project/hardware/test-artifacts
job: linux-6.6.56-x86_64
ref: master
- project: xen-project/hardware/test-artifacts
- job: alpine-3.18-x86_64-rootfs
+ job: alpine-3.24-x86_64-rootfs
ref: master
- project: xen-project/hardware/test-artifacts
job: microcode-x86
@@ -260,7 +260,7 @@ adl-smoke-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-smoke-x86-64-dom0pvh-gcc-debug:
extends: .adl-x86-64
@@ -268,7 +268,7 @@ adl-smoke-x86-64-dom0pvh-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
extends: .adl-x86-64
@@ -276,7 +276,7 @@ adl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-suspend-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -284,7 +284,7 @@ adl-suspend-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-pci-pv-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -292,7 +292,7 @@ adl-pci-pv-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-pci-hvm-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -300,7 +300,7 @@ adl-pci-hvm-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-pvshim-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -308,7 +308,7 @@ adl-pvshim-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-tools-tests-pv-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -319,7 +319,7 @@ adl-tools-tests-pv-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
adl-tools-tests-pvh-x86-64-gcc-debug:
extends: .adl-x86-64
@@ -330,7 +330,7 @@ adl-tools-tests-pvh-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-smoke-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -338,7 +338,7 @@ kbl-smoke-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-smoke-x86-64-dom0pvh-gcc-debug:
extends: .kbl-x86-64
@@ -346,7 +346,7 @@ kbl-smoke-x86-64-dom0pvh-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
extends: .kbl-x86-64
@@ -354,7 +354,7 @@ kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-suspend-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -362,7 +362,7 @@ kbl-suspend-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-pci-pv-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -370,7 +370,7 @@ kbl-pci-pv-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-pci-hvm-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -378,7 +378,7 @@ kbl-pci-hvm-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-pvshim-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -386,7 +386,7 @@ kbl-pvshim-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-tools-tests-pv-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -397,7 +397,7 @@ kbl-tools-tests-pv-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
kbl-tools-tests-pvh-x86-64-gcc-debug:
extends: .kbl-x86-64
@@ -408,7 +408,7 @@ kbl-tools-tests-pvh-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen2-smoke-x86-64-gcc-debug:
extends: .zen2-x86-64
@@ -416,7 +416,7 @@ zen2-smoke-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen2-suspend-x86-64-gcc-debug:
extends: .zen2-x86-64
@@ -424,7 +424,7 @@ zen2-suspend-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-smoke-x86-64-gcc-debug:
extends: .zen3p-x86-64
@@ -432,7 +432,7 @@ zen3p-smoke-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-smoke-x86-64-dom0pvh-gcc-debug:
extends: .zen3p-x86-64
@@ -440,7 +440,7 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug:
extends: .zen3p-x86-64
@@ -448,7 +448,7 @@ zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-pci-hvm-x86-64-gcc-debug:
extends: .zen3p-x86-64
@@ -456,7 +456,7 @@ zen3p-pci-hvm-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-pvshim-x86-64-gcc-debug:
extends: .zen3p-x86-64
@@ -464,7 +464,7 @@ zen3p-pvshim-x86-64-gcc-debug:
- ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-tools-tests-pv-x86-64-gcc-debug:
extends: .zen3p-x86-64
@@ -475,7 +475,7 @@ zen3p-tools-tests-pv-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
zen3p-tools-tests-pvh-x86-64-gcc-debug:
extends: .zen3p-x86-64
@@ -486,7 +486,7 @@ zen3p-tools-tests-pvh-x86-64-gcc-debug:
junit: tests-junit.xml
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
qemu-smoke-dom0-arm64-gcc:
extends: .qemu-arm64
@@ -654,7 +654,7 @@ qemu-alpine-x86_64-gcc:
- ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE}
needs:
- *x86-64-test-needs
- - alpine-3.18-gcc
+ - alpine-3.24-x86_64-gcc
qemu-smoke-x86-64-gcc:
extends: .qemu-smoke-x86-64
@@ -698,7 +698,7 @@ qemu-xtf-argo-x86_64-gcc-debug:
script:
- ./automation/scripts/qemu-xtf.sh x86-64 pv64 argo 2>&1 | tee ${LOGFILE}
needs:
- - alpine-3.18-gcc-debug
+ - alpine-3.24-x86_64-gcc-debug
qemu-smoke-riscv64-gcc:
extends: .qemu-riscv64
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index aea842e1ff2d..e9b2f6122ff1 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -24,7 +24,7 @@ die() {
#
BASE="registry.gitlab.com/xen-project/xen"
case "_${CONTAINER}" in
- _alpine) CONTAINER="${BASE}/alpine:3.18" ;;
+ _alpine) CONTAINER="${BASE}/alpine:3.24-x86_64" ;;
_alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;;
_archlinux|_arch) CONTAINER="${BASE}/archlinux:current-x86_64" ;;
_fedora) CONTAINER="${BASE}/fedora:43-x86_64";;
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/7] CI: Update the Alpine arm64 container to 3.24
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
` (3 preceding siblings ...)
2026-06-12 23:09 ` [PATCH 4/7] CI: Update the Alpine x86_64 container to 3.24 Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 6/7] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32} Andrew Cooper
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
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@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
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@lists.xenproject.org"
-
-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@lists.xenproject.org"
+
+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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/7] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32}
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
` (4 preceding siblings ...)
2026-06-12 23:09 ` [PATCH 5/7] CI: Update the Alpine arm64 " Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-12 23:09 ` [PATCH 7/7] CI: Remove x86 microcode from arm32 jobs Andrew Cooper
2026-06-13 3:12 ` [PATCH for-4.22 0/7] CI: Refresh Alpine containers dmukhin
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
The configuration uses a mix of dashes and underscores, which is irritating to
develop for. Switch to using the underscore form consistently; it is the more
common form and it has the benefit that it allows splitting on dashes to work
sensibly.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This also removes an artefact from Cody's Gitlab status page, which does use
simple splitting on dashes, and ends up with a mix of "x86" and "x86_64".
I've left Yocto alone. They have bigger problems than just underscores, and
the jobs have bitrotted while they've been off.
---
automation/gitlab-ci/build.yaml | 154 +++++-----
automation/gitlab-ci/test.yaml | 280 +++++++++---------
.../{xtf-x86-64-config => xtf-x86_64-config} | 0
...86-64-efi-config => xtf-x86_64-efi-config} | 0
.../include/{xtf-x86-64 => xtf-x86_64} | 0
.../{xtf-x86-64-efi => xtf-x86_64-efi} | 0
.../{qubes-x86-64.sh => qubes-x86_64.sh} | 0
7 files changed, 217 insertions(+), 217 deletions(-)
rename automation/scripts/include/configs/{xtf-x86-64-config => xtf-x86_64-config} (100%)
rename automation/scripts/include/configs/{xtf-x86-64-efi-config => xtf-x86_64-efi-config} (100%)
rename automation/scripts/include/{xtf-x86-64 => xtf-x86_64} (100%)
rename automation/scripts/include/{xtf-x86-64-efi => xtf-x86_64-efi} (100%)
rename automation/scripts/{qubes-x86-64.sh => qubes-x86_64.sh} (100%)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index fa054a82800b..d5929e34ecaa 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -36,77 +36,77 @@
CXX: clang++
clang: y
-.x86-64-build-tmpl:
+.x86_64-build-tmpl:
<<: *build
variables:
XEN_TARGET_ARCH: x86_64
tags:
- x86_64
-.x86-64-build:
- extends: .x86-64-build-tmpl
+.x86_64-build:
+ extends: .x86_64-build-tmpl
variables:
debug: n
-.x86-64-build-debug:
- extends: .x86-64-build-tmpl
+.x86_64-build-debug:
+ extends: .x86_64-build-tmpl
variables:
debug: y
-.x86-32-build-tmpl:
+.x86_32-build-tmpl:
<<: *build
variables:
XEN_TARGET_ARCH: x86_32
tags:
- x86_32
-.x86-32-build:
- extends: .x86-32-build-tmpl
+.x86_32-build:
+ extends: .x86_32-build-tmpl
variables:
debug: n
-.x86-32-build-debug:
- extends: .x86-32-build-tmpl
+.x86_32-build-debug:
+ extends: .x86_32-build-tmpl
variables:
debug: y
-.gcc-x86-64-build:
- extends: .x86-64-build
+.gcc-x86_64-build:
+ extends: .x86_64-build
variables:
<<: *gcc
-.gcc-x86-64-build-debug:
- extends: .x86-64-build-debug
+.gcc-x86_64-build-debug:
+ extends: .x86_64-build-debug
variables:
<<: *gcc
-.gcc-x86-32-build:
- extends: .x86-32-build
+.gcc-x86_32-build:
+ extends: .x86_32-build
variables:
<<: *gcc
-.gcc-x86-32-build-debug:
- extends: .x86-32-build-debug
+.gcc-x86_32-build-debug:
+ extends: .x86_32-build-debug
variables:
<<: *gcc
-.clang-x86-64-build:
- extends: .x86-64-build
+.clang-x86_64-build:
+ extends: .x86_64-build
variables:
<<: *clang
-.clang-x86-64-build-debug:
- extends: .x86-64-build-debug
+.clang-x86_64-build-debug:
+ extends: .x86_64-build-debug
variables:
<<: *clang
-.clang-x86-32-build:
- extends: .x86-32-build
+.clang-x86_32-build:
+ extends: .x86_32-build
variables:
<<: *clang
-.clang-x86-32-build-debug:
- extends: .x86-32-build-debug
+.clang-x86_32-build-debug:
+ extends: .x86_32-build-debug
variables:
<<: *clang
@@ -244,25 +244,25 @@
tags:
- arm64
-.yocto-test-x86-64:
+.yocto-test-x86_64:
extends: .yocto-test
tags:
- x86_64
-.x86-64-cross-build-tmpl:
+.x86_64-cross-build-tmpl:
<<: *build
variables:
XEN_TARGET_ARCH: x86_64
tags:
- arm64
-.x86-64-cross-build:
- extends: .x86-64-cross-build-tmpl
+.x86_64-cross-build:
+ extends: .x86_64-cross-build-tmpl
variables:
debug: n
-.gcc-x86-64-cross-build:
- extends: .x86-64-cross-build
+.gcc-x86_64-cross-build:
+ extends: .x86_64-cross-build
variables:
<<: *gcc
@@ -271,13 +271,13 @@
# Build jobs needed for tests
alpine-3.24-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
<<: *build-test
variables:
CONTAINER: alpine:3.24-x86_64
alpine-3.24-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
<<: *build-test
variables:
CONTAINER: alpine:3.24-x86_64
@@ -292,13 +292,13 @@ alpine-3.24-x86_64-gcc-debug:
CONFIG_XHCI=y
debian-13-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
<<: *build-test
variables:
CONTAINER: debian:13-x86_64
debian-13-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
<<: *build-test
variables:
CONTAINER: debian:13-x86_64
@@ -482,14 +482,14 @@ yocto-qemuarm:
YOCTO_OUTPUT: --copy-output
yocto-qemux86-64:
- extends: .yocto-test-x86-64
+ extends: .yocto-test-x86_64
variables:
YOCTO_BOARD: qemux86-64
# Cppcheck analysis jobs
debian-12-x86_64-gcc-cppcheck:
- extends: .gcc-x86-64-cross-build
+ extends: .gcc-x86_64-cross-build
variables:
CONTAINER: debian:12-arm64v8-cppcheck
CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
@@ -514,29 +514,29 @@ debian-12-arm64-gcc-cppcheck:
# Build jobs not needed for tests
alpine-3.24-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: alpine:3.24-x86_64
alpine-3.24-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: alpine:3.24-x86_64
archlinux-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: archlinux:current-x86_64
allow_failure: true
archlinux-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: archlinux:current-x86_64
allow_failure: true
debian-12-x86_64-gcc-ibt:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: debian:12-x86_64-gcc-ibt
RANDCONFIG: y
@@ -544,42 +544,42 @@ debian-12-x86_64-gcc-ibt:
CONFIG_XEN_IBT=y
debian-12-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: debian:12-x86_64
debian-12-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: debian:12-x86_64
debian-12-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: debian:12-x86_64
debian-12-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: debian:12-x86_64
debian-12-x86_32-clang-debug:
- extends: .clang-x86-32-build-debug
+ extends: .clang-x86_32-build-debug
variables:
CONTAINER: debian:12-x86_32
debian-12-x86_32-gcc-debug:
- extends: .gcc-x86-32-build-debug
+ extends: .gcc-x86_32-build-debug
variables:
CONTAINER: debian:12-x86_32
debian-13-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: debian:13-x86_64
debian-13-x86_64-clang-randconfig:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: debian:13-x86_64
RANDCONFIG: y
@@ -587,136 +587,136 @@ debian-13-x86_64-clang-randconfig:
CONFIG_COVERAGE=n # Disable coverage otherwise build times out.
debian-13-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: debian:13-x86_64
debian-13-x86_64-gcc-randconfig:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: debian:13-x86_64
RANDCONFIG: y
debian-13-x86_32-clang-debug:
- extends: .clang-x86-32-build-debug
+ extends: .clang-x86_32-build-debug
variables:
CONTAINER: debian:13-x86_32
debian-13-x86_32-gcc-debug:
- extends: .gcc-x86-32-build-debug
+ extends: .gcc-x86_32-build-debug
variables:
CONTAINER: debian:13-x86_32
fedora-43-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: fedora:43-x86_64
fedora-43-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: fedora:43-x86_64
ubuntu-18.04-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: ubuntu:18.04-x86_64
ubuntu-18.04-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: ubuntu:18.04-x86_64
ubuntu-20.04-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: ubuntu:20.04-x86_64
ubuntu-22.04-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: ubuntu:22.04-x86_64
ubuntu-22.04-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: ubuntu:22.04-x86_64
ubuntu-22.04-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: ubuntu:22.04-x86_64
ubuntu-24.04-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: ubuntu:24.04-x86_64
ubuntu-24.04-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: ubuntu:24.04-x86_64
ubuntu-26.04-x86_64-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: ubuntu:26.04-x86_64
ubuntu-26.04-x86_64-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: ubuntu:26.04-x86_64
ubuntu-26.04-x86_64-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: ubuntu:26.04-x86_64
ubuntu-26.04-x86_64-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: ubuntu:26.04-x86_64
opensuse-leap-16.0-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: opensuse:leap-16.0-x86_64
opensuse-leap-16.0-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: opensuse:leap-16.0-x86_64
opensuse-leap-16.0-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: opensuse:leap-16.0-x86_64
opensuse-leap-16.0-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: opensuse:leap-16.0-x86_64
opensuse-tumbleweed-clang:
- extends: .clang-x86-64-build
+ extends: .clang-x86_64-build
variables:
CONTAINER: opensuse:tumbleweed-x86_64
allow_failure: true
opensuse-tumbleweed-clang-debug:
- extends: .clang-x86-64-build-debug
+ extends: .clang-x86_64-build-debug
variables:
CONTAINER: opensuse:tumbleweed-x86_64
allow_failure: true
opensuse-tumbleweed-gcc:
- extends: .gcc-x86-64-build
+ extends: .gcc-x86_64-build
variables:
CONTAINER: opensuse:tumbleweed-x86_64
allow_failure: true
opensuse-tumbleweed-gcc-debug:
- extends: .gcc-x86-64-build-debug
+ extends: .gcc-x86_64-build-debug
variables:
CONTAINER: opensuse:tumbleweed-x86_64
allow_failure: true
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 2a7a0e513e72..fa3f776fc785 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -21,7 +21,7 @@
job: microcode-x86
ref: $ARTIFACTS_BRANCH
-.x86-64-test-needs: &x86-64-test-needs
+.x86_64-test-needs: &x86_64-test-needs
- project: $ARTIFACTS_REPO
job: $LINUX_JOB_X86_64
ref: $ARTIFACTS_BRANCH
@@ -58,11 +58,11 @@
tags:
- arm64
-.qemu-x86-64:
+.qemu-x86_64:
extends: .test-jobs-common
variables:
CONTAINER: debian:13-x86_64
- LOGFILE: qemu-smoke-x86-64.log
+ LOGFILE: qemu-smoke-x86_64.log
artifacts:
paths:
- smoke.serial
@@ -71,8 +71,8 @@
tags:
- x86_64
-.qemu-smoke-x86-64:
- extends: .qemu-x86-64
+.qemu-smoke-x86_64:
+ extends: .qemu-x86_64
variables:
TEST_TIMEOUT_OVERRIDE: 120
@@ -141,7 +141,7 @@
tags:
- xilinx
-.adl-x86-64:
+.adl-x86_64:
extends: .test-jobs-common
variables:
# the test controller runs on RPi4
@@ -164,9 +164,9 @@
tags:
- qubes-hw2
-.kbl-x86-64:
+.kbl-x86_64:
# it's really similar to the ADL one
- extends: .adl-x86-64
+ extends: .adl-x86_64
variables:
PCIDEV: "00:1f.6"
PCIDEV_INTR: "MSI"
@@ -175,9 +175,9 @@
tags:
- qubes-hw3
-.zen2-x86-64:
+.zen2-x86_64:
# it's really similar to the above
- extends: .adl-x86-64
+ extends: .adl-x86_64
variables:
PCIDEV: "01:00.0"
PCIDEV_INTR: "MSI-X"
@@ -186,9 +186,9 @@
tags:
- qubes-hw1
-.zen3p-x86-64:
+.zen3p-x86_64:
# it's really similar to the above
- extends: .adl-x86-64
+ extends: .adl-x86_64
variables:
PCIDEV: "01:00.0"
PCIDEV_INTR: "MSI-X"
@@ -235,7 +235,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug:
script:
- ./automation/scripts/xilinx-smoke-dom0-x86_64.sh ping 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
xilinx-smoke-dom0-x86_64-gcc-debug-argo:
@@ -254,238 +254,238 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo:
job: microcode-x86
ref: master
-adl-smoke-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-smoke-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-smoke-x86-64-dom0pvh-gcc-debug:
- extends: .adl-x86-64
+adl-smoke-x86_64-dom0pvh-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- extends: .adl-x86-64
+adl-smoke-x86_64-dom0pvh-hvm-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-suspend-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-suspend-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-pci-pv-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-pci-pv-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-pci-hvm-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-pci-hvm-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-pvshim-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-pvshim-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-tools-tests-pv-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-tools-tests-pv-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-adl-tools-tests-pvh-x86-64-gcc-debug:
- extends: .adl-x86-64
+adl-tools-tests-pvh-x86_64-gcc-debug:
+ extends: .adl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-smoke-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-smoke-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-smoke-x86-64-dom0pvh-gcc-debug:
- extends: .kbl-x86-64
+kbl-smoke-x86_64-dom0pvh-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- extends: .kbl-x86-64
+kbl-smoke-x86_64-dom0pvh-hvm-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-suspend-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-suspend-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-pci-pv-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-pci-pv-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-pci-hvm-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-pci-hvm-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-pvshim-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-pvshim-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-tools-tests-pv-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-tools-tests-pv-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-kbl-tools-tests-pvh-x86-64-gcc-debug:
- extends: .kbl-x86-64
+kbl-tools-tests-pvh-x86_64-gcc-debug:
+ extends: .kbl-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen2-smoke-x86-64-gcc-debug:
- extends: .zen2-x86-64
+zen2-smoke-x86_64-gcc-debug:
+ extends: .zen2-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen2-suspend-x86-64-gcc-debug:
- extends: .zen2-x86-64
+zen2-suspend-x86_64-gcc-debug:
+ extends: .zen2-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-smoke-x86-64-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-smoke-x86_64-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-smoke-x86-64-dom0pvh-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-smoke-x86_64-dom0pvh-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-smoke-x86_64-dom0pvh-hvm-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-pci-hvm-x86-64-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-pci-hvm-x86_64-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-pvshim-x86-64-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-pvshim-x86_64-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-tools-tests-pv-x86-64-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-tools-tests-pv-x86_64-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
-zen3p-tools-tests-pvh-x86-64-gcc-debug:
- extends: .zen3p-x86-64
+zen3p-tools-tests-pvh-x86_64-gcc-debug:
+ extends: .zen3p-x86_64
script:
- - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
artifacts:
reports:
junit: tests-junit.xml
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc-debug
qemu-smoke-dom0-arm64-gcc:
@@ -649,54 +649,54 @@ qemu-smoke-dom0less-arm32-gcc-debug-earlyprintk:
- debian-12-arm32-gcc-debug-earlyprintk
qemu-alpine-x86_64-gcc:
- extends: .qemu-x86-64
+ extends: .qemu-x86_64
script:
- ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE}
needs:
- - *x86-64-test-needs
+ - *x86_64-test-needs
- alpine-3.24-x86_64-gcc
-qemu-smoke-x86-64-gcc:
- extends: .qemu-smoke-x86-64
+qemu-smoke-x86_64-gcc:
+ extends: .qemu-smoke-x86_64
script:
- - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LOGFILE}
needs:
- debian-13-x86_64-gcc-debug
-qemu-smoke-x86-64-clang:
- extends: .qemu-smoke-x86-64
+qemu-smoke-x86_64-clang:
+ extends: .qemu-smoke-x86_64
script:
- - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LOGFILE}
needs:
- debian-13-x86_64-clang-debug
-qemu-smoke-x86-64-gcc-pvh:
- extends: .qemu-smoke-x86-64
+qemu-smoke-x86_64-gcc-pvh:
+ extends: .qemu-smoke-x86_64
script:
- - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${LOGFILE}
needs:
- debian-13-x86_64-gcc-debug
-qemu-smoke-x86-64-clang-pvh:
- extends: .qemu-smoke-x86-64
+qemu-smoke-x86_64-clang-pvh:
+ extends: .qemu-smoke-x86_64
script:
- - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${LOGFILE}
needs:
- debian-13-x86_64-clang-debug
-qemu-smoke-x86-64-gcc-efi:
- extends: .qemu-smoke-x86-64
+qemu-smoke-x86_64-gcc-efi:
+ extends: .qemu-smoke-x86_64
script:
- - ./automation/scripts/qemu-xtf.sh x86-64-efi pv64 example 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64-efi pv64 example 2>&1 | tee ${LOGFILE}
needs:
- debian-13-x86_64-gcc-debug
qemu-xtf-argo-x86_64-gcc-debug:
- extends: .qemu-smoke-x86-64
+ extends: .qemu-smoke-x86_64
variables:
TEST_TIMEOUT_OVERRIDE: 60
script:
- - ./automation/scripts/qemu-xtf.sh x86-64 pv64 argo 2>&1 | tee ${LOGFILE}
+ - ./automation/scripts/qemu-xtf.sh x86_64 pv64 argo 2>&1 | tee ${LOGFILE}
needs:
- alpine-3.24-x86_64-gcc-debug
diff --git a/automation/scripts/include/configs/xtf-x86-64-config b/automation/scripts/include/configs/xtf-x86_64-config
similarity index 100%
rename from automation/scripts/include/configs/xtf-x86-64-config
rename to automation/scripts/include/configs/xtf-x86_64-config
diff --git a/automation/scripts/include/configs/xtf-x86-64-efi-config b/automation/scripts/include/configs/xtf-x86_64-efi-config
similarity index 100%
rename from automation/scripts/include/configs/xtf-x86-64-efi-config
rename to automation/scripts/include/configs/xtf-x86_64-efi-config
diff --git a/automation/scripts/include/xtf-x86-64 b/automation/scripts/include/xtf-x86_64
similarity index 100%
rename from automation/scripts/include/xtf-x86-64
rename to automation/scripts/include/xtf-x86_64
diff --git a/automation/scripts/include/xtf-x86-64-efi b/automation/scripts/include/xtf-x86_64-efi
similarity index 100%
rename from automation/scripts/include/xtf-x86-64-efi
rename to automation/scripts/include/xtf-x86_64-efi
diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86_64.sh
similarity index 100%
rename from automation/scripts/qubes-x86-64.sh
rename to automation/scripts/qubes-x86_64.sh
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/7] CI: Remove x86 microcode from arm32 jobs
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
` (5 preceding siblings ...)
2026-06-12 23:09 ` [PATCH 6/7] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32} Andrew Cooper
@ 2026-06-12 23:09 ` Andrew Cooper
2026-06-13 3:12 ` [PATCH for-4.22 0/7] CI: Refresh Alpine containers dmukhin
7 siblings, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2026-06-12 23:09 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
All build containers are non-root now. Complete the todo by dropping the
workaround.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
automation/gitlab-ci/test.yaml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index fa3f776fc785..4d5831f9ffcf 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -14,12 +14,7 @@
ref: $ARTIFACTS_BRANCH
.arm32-test-needs: &arm32-test-needs
- # Bodge to ensure binaries/ is non-root. Can be any artefact which comes
- # from a non-root container, and microcode-x86 is the smallest. Remove when
- # all build containers have become non-root.
- - project: $ARTIFACTS_REPO
- job: microcode-x86
- ref: $ARTIFACTS_BRANCH
+ -
.x86_64-test-needs: &x86_64-test-needs
- project: $ARTIFACTS_REPO
--
2.39.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH for-4.22 0/7] CI: Refresh Alpine containers
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
` (6 preceding siblings ...)
2026-06-12 23:09 ` [PATCH 7/7] CI: Remove x86 microcode from arm32 jobs Andrew Cooper
@ 2026-06-13 3:12 ` dmukhin
7 siblings, 0 replies; 9+ messages in thread
From: dmukhin @ 2026-06-13 3:12 UTC (permalink / raw)
To: Andrew Cooper
Cc: Xen-devel, Anthony PERARD, Stefano Stabellini, Michal Orzel,
Doug Goldstein, Roger Pau Monné,
Marek Marczykowski-Górecki, Oleksii Kurochko
On Sat, Jun 13, 2026 at 12:09:17AM +0100, Andrew Cooper wrote:
> Refresh and update the Alpine containers.
>
> https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2598243590
>
> This gets us off an obsolete version of Alpine, and finishes several
> improvement projects (naming, and non-root containers) all at once.
>
> Andrew Cooper (7):
> tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive
> Config.mk: Update QEMU to include pip-25.2 bugfix
> CI: Introduce new qubes-hw-runner.dockerfile
> CI: Update the Alpine x86_64 container to 3.24
> CI: Update the Alpine arm64 container to 3.24
> CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32}
> CI: Remove x86 microcode from arm32 jobs
Please consider
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
for the entire series.
>
> Config.mk | 4 +-
> .../build/alpine/3.18-arm64v8.dockerfile | 51 ---
> automation/build/alpine/3.18.dockerfile | 52 ---
> .../build/alpine/3.24-arm64v8.dockerfile | 53 +++
> .../build/alpine/3.24-x86_64.dockerfile | 65 +++
> .../build/alpine/qubes-hw-runner.dockerfile | 21 +
> automation/gitlab-ci/build.yaml | 202 ++++-----
> automation/gitlab-ci/test.yaml | 385 +++++++++---------
> automation/scripts/containerize | 2 +-
> .../{xtf-x86-64-config => xtf-x86_64-config} | 0
> ...86-64-efi-config => xtf-x86_64-efi-config} | 0
> .../include/{xtf-x86-64 => xtf-x86_64} | 0
> .../{xtf-x86-64-efi => xtf-x86_64-efi} | 0
> .../{qubes-x86-64.sh => qubes-x86_64.sh} | 0
> tools/xentrace/xenalyze.c | 11 +
> 15 files changed, 444 insertions(+), 402 deletions(-)
> delete mode 100644 automation/build/alpine/3.18-arm64v8.dockerfile
> delete mode 100644 automation/build/alpine/3.18.dockerfile
> create mode 100644 automation/build/alpine/3.24-arm64v8.dockerfile
> create mode 100644 automation/build/alpine/3.24-x86_64.dockerfile
> create mode 100644 automation/build/alpine/qubes-hw-runner.dockerfile
> rename automation/scripts/include/configs/{xtf-x86-64-config => xtf-x86_64-config} (100%)
> rename automation/scripts/include/configs/{xtf-x86-64-efi-config => xtf-x86_64-efi-config} (100%)
> rename automation/scripts/include/{xtf-x86-64 => xtf-x86_64} (100%)
> rename automation/scripts/include/{xtf-x86-64-efi => xtf-x86_64-efi} (100%)
> rename automation/scripts/{qubes-x86-64.sh => qubes-x86_64.sh} (100%)
>
> --
> 2.39.5
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-06-13 3:13 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-12 23:09 [PATCH for-4.22 0/7] CI: Refresh Alpine containers Andrew Cooper
2026-06-12 23:09 ` [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive Andrew Cooper
2026-06-12 23:09 ` [PATCH 2/7] Config.mk: Update QEMU to include pip-25.2 bugfix Andrew Cooper
2026-06-12 23:09 ` [PATCH 3/7] CI: Introduce new qubes-hw-runner.dockerfile Andrew Cooper
2026-06-12 23:09 ` [PATCH 4/7] CI: Update the Alpine x86_64 container to 3.24 Andrew Cooper
2026-06-12 23:09 ` [PATCH 5/7] CI: Update the Alpine arm64 " Andrew Cooper
2026-06-12 23:09 ` [PATCH 6/7] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32} Andrew Cooper
2026-06-12 23:09 ` [PATCH 7/7] CI: Remove x86 microcode from arm32 jobs Andrew Cooper
2026-06-13 3:12 ` [PATCH for-4.22 0/7] CI: Refresh Alpine containers dmukhin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.