ci: upgrade centos stream to 10

diff --git a/.github/workflows/container-extra.yml b/.github/workflows/container-extra.yml
index 92356686a75d085146c4bff1ac8e7bc45754bf91..7bb1ab58ed681f8df713f0bea1fa852c8e0a8790 100644 (file)
--- a/.github/workflows/container-extra.yml
+++ b/.github/workflows/container-extra.yml
@@ -38,7 +38,7 @@ jobs:
                     - { dockerfile: 'Dockerfile-alpine', tag: 'alpine:edge',    platform: 'linux/amd64' }
                     - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:latest',  platform: 'linux/amd64' }
                     - { dockerfile: 'Dockerfile-fedora', tag: 'fedora:rawhide', platform: 'linux/amd64', registry: 'registry.fedoraproject.org' }
-                    - { dockerfile: 'Dockerfile-fedora', tag: 'centos:stream9', platform: 'linux/amd64', registry: 'quay.io/centos' }
+                    - { dockerfile: 'Dockerfile-fedora', tag: 'centos:stream10-development', platform: 'linux/amd64', registry: 'quay.io/centos' }
         steps:
             -   name: Check out the repo
                 uses: actions/checkout@v4

diff --git a/.github/workflows/manualtest.yml b/.github/workflows/manualtest.yml
index 50008b5b77a5fc1ffc42ff19f9d5943849e5dc3d..b0aed1cd99c2940c0744e0c1580ffd3de9eb9c47 100644 (file)
--- a/.github/workflows/manualtest.yml
+++ b/.github/workflows/manualtest.yml
@@ -14,6 +14,7 @@ on:
                     - "all"
                     - "alpine"
                     - "alpine:edge"
+                    - "centos:stream10-development"
                     - "fedora"
                     - "fedora:rawhide"
                     - "arch"

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index 4df1cac35caf5de4adea7bd22c6ba9e620b5a2db..ae017c6225c44bc545eb4f847a06b9ef959f1e6a 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -7,13 +7,15 @@ FROM ${REGISTRY}/${DISTRIBUTION}
 ARG DISTRIBUTION
 
 RUN \
-if [ "${DISTRIBUTION}" = "centos:stream9" ]; then \
+if [[ "${DISTRIBUTION}" =~ "centos:" ]]; then \
     dnf config-manager --set-enabled crb; \
 else \
     dnf -y install --setopt=install_weak_deps=False \
     asciidoctor \
     btrfs-progs \
     busybox \
+    dhcp-client \
+    dhcp-server \
     dmraid \
     erofs-utils \
     f2fs-tools \
@@ -39,8 +41,6 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     cryptsetup \
     dbus-daemon \
     device-mapper-multipath \
-    dhcp-client \
-    dhcp-server \
     e2fsprogs \
     fcoe-utils \
     fuse3 \