Skip to contentSkip to conversation

automation: update test-artifacts to use Debian Bookworm instead of unstable

PATCH In review Stefano Stabellini 2 participants 6 messages Aug 12, 2023 – Aug 14, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): alpine.DEB.2.22.394.2308111842430.6458@ubuntu-linux-20-04-desktopa

#1 lore raw

PATCH 1/3 automation: switch from Debian unstable to bookworm

From: Stefano Stabellini <[email protected]>

Debian unstable used in the Xen containers is actually bookworm. Switching to bookworm which is now stable means we are not basing our containers on a moving target anymore.

---
 ...2-gcc.dockerfile => bookworm-arm64v8-arm32-gcc.dockerfile} | 2 +-
 ...nstable-arm64v8.dockerfile => bookworm-arm64v8.dockerfile} | 2 +-
 ...table-cppcheck.dockerfile => bookworm-cppcheck.dockerfile} | 4 ++--
 .../{unstable-i386.dockerfile => bookworm-i386.dockerfile}    | 2 +-
 .../build/debian/{unstable.dockerfile => bookworm.dockerfile} | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename automation/build/debian/{unstable-arm64v8-arm32-gcc.dockerfile => bookworm-arm64v8-arm32-gcc.dockerfile} (94%)
 rename automation/build/debian/{unstable-arm64v8.dockerfile => bookworm-arm64v8.dockerfile} (97%)
 rename automation/build/debian/{unstable-cppcheck.dockerfile => bookworm-cppcheck.dockerfile} (95%)
 rename automation/build/debian/{unstable-i386.dockerfile => bookworm-i386.dockerfile} (97%)
 rename automation/build/debian/{unstable.dockerfile => bookworm.dockerfile} (98%)
automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile renamed from automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile +1 -1
similarity index 94%
rename from automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
rename to automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
index 11860425a6..b3295c435e 100644
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
automation/build/debian/bookworm-arm64v8.dockerfile renamed from automation/build/debian/unstable-arm64v8.dockerfile +1 -1
similarity index 97%
rename from automation/build/debian/unstable-arm64v8.dockerfile
rename to automation/build/debian/bookworm-arm64v8.dockerfile
index b9b1587f88..a6d4246d96 100644
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
automation/build/debian/bookworm-cppcheck.dockerfile renamed from automation/build/debian/unstable-cppcheck.dockerfile +2 -2
similarity index 95%
rename from automation/build/debian/unstable-cppcheck.dockerfile
rename to automation/build/debian/bookworm-cppcheck.dockerfile
index adc192cea6..d64fb7b18c 100644
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable AS builder
+FROM arm64v8/debian:bookworm AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CPPCHECK_VERSION=2.7
@@ -24,7 +24,7 @@ RUN curl -fsSLO https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".t
         FILESDIR=/usr/share/cppcheck \
         HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
 
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck
 COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck
 
automation/build/debian/bookworm-i386.dockerfile renamed from automation/build/debian/unstable-i386.dockerfile +1 -1
similarity index 97%
rename from automation/build/debian/unstable-i386.dockerfile
rename to automation/build/debian/bookworm-i386.dockerfile
index 1c4928b09e..eb1c732f53 100644
@@ -1,4 +1,4 @@
-FROM i386/debian:unstable
+FROM i386/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
automation/build/debian/bookworm.dockerfile renamed from automation/build/debian/unstable.dockerfile +1 -1
similarity index 98%
rename from automation/build/debian/unstable.dockerfile
rename to automation/build/debian/bookworm.dockerfile
index 6ef2878200..f8415425e6 100644
@@ -1,4 +1,4 @@
-FROM debian:unstable
+FROM debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] automation: switch from Debian unstable to bookworm

Hi Stefano,

Quoted 9 lines · Stefano Stabellini

From: Stefano Stabellini <[email protected]>

Debian unstable used in the Xen containers is actually bookworm. Switching to bookworm which is now stable means we are not basing our containers on a moving target anymore.

You should also update "containerize" script to keep it up-to-date to allow making use of the newly created containers. With that fixed (no need for respin):

~Michal

#3 lore raw

PATCH 2/3 automation: update test-artifacts to use Debian Bookworm instead of unstable

In reply to a message not in the archive

From: Stefano Stabellini <[email protected]>

---
 automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile       | 2 +-
 automation/tests-artifacts/kernel/6.1.19.dockerfile             | 2 +-
 .../qemu-system-aarch64/6.0.0-arm64v8.dockerfile                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +1 -1
index e445c1f03a..a53a97d727 100644
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
automation/tests-artifacts/kernel/6.1.19.dockerfile +1 -1
index c2171555a0..d5b787c1cb 100644
@@ -1,4 +1,4 @@
-FROM debian:unstable
+FROM debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile +1 -1
index 793432d40b..e277e13b60 100644
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:unstable
+FROM arm64v8/debian:bookworm
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="[email protected]"
 
Signature · 1 line
2.25.1
#5 lore raw

PATCH 3/3 automation: update jobs to use Debian Bookworm instead of unstable

In reply to a message not in the archive

From: Stefano Stabellini <[email protected]>

---
 automation/gitlab-ci/build.yaml | 84 ++++++++++++++++-----------------
 automation/gitlab-ci/test.yaml  | 24 +++++-----
 2 files changed, 54 insertions(+), 54 deletions(-)
automation/gitlab-ci/build.yaml +42 -42
index 173613567c..1a4a5e490d 100644
@@ -360,53 +360,53 @@ debian-stretch-gcc-debug:
   variables:
     CONTAINER: debian:stretch
 
-debian-unstable-clang-debug:
+debian-bookworm-clang-debug:
   extends: .clang-x86-64-build-debug
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
 
 # Arm32 cross-build
 
-debian-unstable-gcc-arm32:
+debian-bookworm-gcc-arm32:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
 
-debian-unstable-gcc-arm32-debug:
+debian-bookworm-gcc-arm32-debug:
   extends: .gcc-arm32-cross-build-debug
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
 
-debian-unstable-gcc-arm32-randconfig:
+debian-bookworm-gcc-arm32-randconfig:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
     RANDCONFIG: y
 
-debian-unstable-gcc-arm32-debug-randconfig:
+debian-bookworm-gcc-arm32-debug-randconfig:
   extends: .gcc-arm32-cross-build-debug
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
     RANDCONFIG: y
 
-debian-unstable-gcc-arm32-staticmem:
+debian-bookworm-gcc-arm32-staticmem:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
     EXTRA_XEN_CONFIG: |
       CONFIG_EXPERT=y
       CONFIG_UNSUPPORTED=y
       CONFIG_STATIC_MEMORY=y
 
-debian-unstable-gcc-arm32-debug-staticmem:
+debian-bookworm-gcc-arm32-debug-staticmem:
   extends: .gcc-arm32-cross-build-debug
   variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
     HYPERVISOR_ONLY: y
     EXTRA_XEN_CONFIG: |
       CONFIG_EXPERT=y
@@ -415,26 +415,26 @@ debian-unstable-gcc-arm32-debug-staticmem:
 
 # Arm builds
 
-debian-unstable-gcc-arm64:
+debian-bookworm-gcc-arm64:
   extends: .gcc-arm64-build
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
 
-debian-unstable-gcc-debug-arm64:
+debian-bookworm-gcc-debug-arm64:
   extends: .gcc-arm64-build-debug
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
 
-debian-unstable-gcc-arm64-randconfig:
+debian-bookworm-gcc-arm64-randconfig:
   extends: .gcc-arm64-build
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
     RANDCONFIG: y
 
-debian-unstable-gcc-debug-arm64-randconfig:
+debian-bookworm-gcc-debug-arm64-randconfig:
   extends: .gcc-arm64-build-debug
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
     RANDCONFIG: y
 
 alpine-3.18-gcc-arm64:
@@ -597,26 +597,26 @@ yocto-qemux86-64:
 
 # Cppcheck analysis jobs
 
-debian-unstable-gcc-cppcheck:
+debian-bookworm-gcc-cppcheck:
   extends: .gcc-x86-64-cross-build
   variables:
-    CONTAINER: debian:unstable-cppcheck
+    CONTAINER: debian:bookworm-cppcheck
     CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
     CPPCHECK: y
     HYPERVISOR_ONLY: y
 
-debian-unstable-gcc-arm32-cppcheck:
+debian-bookworm-gcc-arm32-cppcheck:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-cppcheck
+    CONTAINER: debian:bookworm-cppcheck
     CROSS_COMPILE: /usr/bin/arm-linux-gnueabihf-
     CPPCHECK: y
     HYPERVISOR_ONLY: y
 
-debian-unstable-gcc-arm64-cppcheck:
+debian-bookworm-gcc-arm64-cppcheck:
   extends: .gcc-arm64-build
   variables:
-    CONTAINER: debian:unstable-cppcheck
+    CONTAINER: debian:bookworm-cppcheck
     CPPCHECK: y
     HYPERVISOR_ONLY: y
 
@@ -685,42 +685,42 @@ debian-buster-gcc-ibt:
     EXTRA_FIXED_RANDCONFIG: |
       CONFIG_XEN_IBT=y
 
-debian-unstable-clang:
+debian-bookworm-clang:
   extends: .clang-x86-64-build
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
 
-debian-unstable-gcc:
+debian-bookworm-gcc:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
 
-debian-unstable-gcc-debug:
+debian-bookworm-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
 
-debian-unstable-gcc-randconfig:
+debian-bookworm-gcc-randconfig:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
     RANDCONFIG: y
 
-debian-unstable-gcc-debug-randconfig:
+debian-bookworm-gcc-debug-randconfig:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: debian:unstable
+    CONTAINER: debian:bookworm
     RANDCONFIG: y
 
-debian-unstable-32-clang-debug:
+debian-bookworm-32-clang-debug:
   extends: .clang-x86-32-build-debug
   variables:
-    CONTAINER: debian:unstable-i386
+    CONTAINER: debian:bookworm-i386
 
-debian-unstable-32-gcc-debug:
+debian-bookworm-32-gcc-debug:
   extends: .gcc-x86-32-build-debug
   variables:
-    CONTAINER: debian:unstable-i386
+    CONTAINER: debian:bookworm-i386
 
 fedora-gcc:
   extends: .gcc-x86-64-build
automation/gitlab-ci/test.yaml +12 -12
index 8ccce1fe26..810631bc46 100644
@@ -22,7 +22,7 @@
 .qemu-arm64:
   extends: .test-jobs-common
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
     LOGFILE: qemu-smoke-arm64.log
   artifacts:
     paths:
@@ -35,7 +35,7 @@
 .qemu-arm32:
   extends: .test-jobs-common
   variables:
-    CONTAINER: debian:unstable-arm64v8
+    CONTAINER: debian:bookworm-arm64v8
     LOGFILE: qemu-smoke-arm32.log
   artifacts:
     paths:
@@ -357,7 +357,7 @@ qemu-smoke-dom0less-arm32-gcc:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32
+    - debian-bookworm-gcc-arm32
 
 qemu-smoke-dom0less-arm32-gcc-debug:
   extends: .qemu-arm32
@@ -365,7 +365,7 @@ qemu-smoke-dom0less-arm32-gcc-debug:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32-debug
+    - debian-bookworm-gcc-arm32-debug
 
 qemu-smoke-dom0less-arm32-gcc-staticmem:
   extends: .qemu-arm32
@@ -373,7 +373,7 @@ qemu-smoke-dom0less-arm32-gcc-staticmem:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32-staticmem
+    - debian-bookworm-gcc-arm32-staticmem
 
 qemu-smoke-dom0less-arm32-gcc-debug-staticmem:
   extends: .qemu-arm32
@@ -381,7 +381,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-staticmem:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32-debug-staticmem
+    - debian-bookworm-gcc-arm32-debug-staticmem
 
 qemu-smoke-dom0less-arm32-gcc-gzip:
   extends: .qemu-arm32
@@ -389,7 +389,7 @@ qemu-smoke-dom0less-arm32-gcc-gzip:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32
+    - debian-bookworm-gcc-arm32
 
 qemu-smoke-dom0less-arm32-gcc-debug-gzip:
   extends: .qemu-arm32
@@ -397,7 +397,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-gzip:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32-debug
+    - debian-bookworm-gcc-arm32-debug
 
 qemu-smoke-dom0less-arm32-gcc-without-dom0:
   extends: .qemu-arm32
@@ -405,7 +405,7 @@ qemu-smoke-dom0less-arm32-gcc-without-dom0:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32
+    - debian-bookworm-gcc-arm32
 
 qemu-smoke-dom0less-arm32-gcc-debug-without-dom0:
   extends: .qemu-arm32
@@ -413,7 +413,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-without-dom0:
     - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
   needs:
     - *arm32-test-needs
-    - debian-unstable-gcc-arm32-debug
+    - debian-bookworm-gcc-arm32-debug
 
 qemu-alpine-x86_64-gcc:
   extends: .qemu-x86-64
@@ -435,7 +435,7 @@ qemu-smoke-x86-64-clang:
   script:
     - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
   needs:
-    - debian-unstable-clang-debug
+    - debian-bookworm-clang-debug
 
 qemu-smoke-x86-64-gcc-pvh:
   extends: .qemu-x86-64
@@ -449,7 +449,7 @@ qemu-smoke-x86-64-clang-pvh:
   script:
     - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
   needs:
-    - debian-unstable-clang-debug
+    - debian-bookworm-clang-debug
 
 qemu-smoke-riscv64-gcc:
   extends: .qemu-riscv64
Signature · 1 line
2.25.1