From 1d739c5b2fbd817de6ec70bed66ac855a045e3cc Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Jul 2024 14:44:53 -0700 Subject: [PATCH] ci/cirrus: switch from CentOS to Rocky Linux Remove CentOS 7 as it is EOL. Add back Rocky Linux 8 (CentOS Stream 8 was removed by commit 40bb9c468ea85a). Switch from CentOS Stream 9 to Rocky Linux 9, mostly for simplicity. Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index e8405d14ebf..3fbd0495bd8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,6 @@ --- -# We use Cirrus for CentOS (native) and Fedora (in Vagrant), because neither -# CentOS nor Fedora is available on GHA natively, so the only option is VM. +# We use Cirrus for Rocky Linux (native) and Fedora (in Vagrant), because neither +# Rocky nor Fedora is available on GHA natively, so the only option is VM. # In GHA, nested virtualization is only supported on macOS instances, which # are slow and flaky. @@ -82,13 +82,13 @@ task: RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux # yamllint disable rule:key-duplicates matrix: - DISTRO: centos-7 - DISTRO: centos-stream-9 + DISTRO: rocky-linux-8 + DISTRO: rocky-linux-9 name: ci / $DISTRO compute_engine_instance: - image_project: centos-cloud + image_project: rocky-linux-cloud image: family/$DISTRO platform: linux cpu: 4 @@ -96,15 +96,10 @@ task: install_dependencies_script: | case $DISTRO in - centos-7) - (cd /etc/yum.repos.d && curl -O https://copr.fedorainfracloud.org/coprs/adrian/criu-el7/repo/epel-7/adrian-criu-el7-epel-7.repo) - # EPEL is needed for jq and fuse-sshfs. - rpm -q epel-release || rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - # sysctl - echo "user.max_user_namespaces=15076" > /etc/sysctl.d/userns.conf - sysctl --system + rocky-linux-8) + yum config-manager --set-enabled powertools # for glibc-static ;; - centos-stream-9) + rocky-linux-9) dnf config-manager --set-enabled crb # for glibc-static dnf -y install epel-release epel-next-release # for fuse-sshfs # Delegate all cgroup v2 controllers to rootless user via --systemd-cgroup. @@ -178,23 +173,6 @@ task: integration_fs_script: | ssh -tt localhost "make -C /home/runc localintegration" integration_systemd_rootless_script: | - case $DISTRO in - centos-7) - echo "SKIP: integration_systemd_rootless_script requires cgroup v2" - ;; - *) - ssh -tt localhost "make -C /home/runc localrootlessintegration RUNC_USE_SYSTEMD=yes" - esac + ssh -tt localhost "make -C /home/runc localrootlessintegration RUNC_USE_SYSTEMD=yes" integration_fs_rootless_script: | - case $DISTRO in - centos-7) - # Most probably EPERM on cgroup.procs is caused by some missing kernel - # patch. The other issue is SELinux, but even with SELinux fixes in - # https://github.com/opencontainers/runc/pull/4068 it still doesn't work. - # Does not make sense in trying to fix this since it's an older distro. - echo "SKIP: integration_fs_rootless_script is skipped because of EPERM on writing cgroup.procs" - ;; - *) - ssh -tt localhost "make -C /home/runc localrootlessintegration" - ;; - esac + ssh -tt localhost "make -C /home/runc localrootlessintegration"