From 94167dae295a293a8e41ca6e0cdfd860ed8f2300 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 17:41:59 -0800 Subject: [PATCH 1/2] .cirrus.yml: use dnf not yum Since we dropped EL7, we can use dnf everywhere. Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5309343fd65..80f9a3e6182 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -46,9 +46,9 @@ task: # Work around dnf mirror failures by retrying a few times. for i in $(seq 0 2); do sleep $i - yum install -y --setopt=install_weak_deps=False --setopt=tsflags=nodocs $RPMS && break + dnf install -y --setopt=install_weak_deps=False --setopt=tsflags=nodocs $RPMS && break done - [ $? -eq 0 ] # fail if yum failed + [ $? -eq 0 ] # fail if dnf failed case $DISTRO in *-8) From 4f93f06fb71cc97a8d9131ee2b71a78d9a626781 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 17:42:37 -0800 Subject: [PATCH 2/2] ci: add centos-cloud-10 run Alas there's no almalinux-10 so we use centos-stream-10. Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 80f9a3e6182..e182c61063f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,13 +16,17 @@ task: RPMS: gcc git-core iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux # yamllint disable rule:key-duplicates matrix: - DISTRO: almalinux-8 - DISTRO: almalinux-9 + - DISTRO: almalinux-8 + IMAGE_PROJECT: almalinux-cloud + - DISTRO: almalinux-9 + IMAGE_PROJECT: almalinux-cloud + - DISTRO: centos-stream-10 + IMAGE_PROJECT: centos-cloud name: ci / $DISTRO compute_engine_instance: - image_project: almalinux-cloud + image_project: $IMAGE_PROJECT image: family/$DISTRO platform: linux cpu: 4 @@ -33,7 +37,7 @@ task: *-8) dnf config-manager --set-enabled powertools # for glibc-static ;; - *-9) + *-9|*-10) dnf config-manager --set-enabled crb # for glibc-static dnf -y install epel-release # for fuse-sshfs # Delegate all cgroup v2 controllers to rootless user via --systemd-cgroup.