From 823636c3ddd07241e586e44ea5e6fa9c0546b34b Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 3 Nov 2023 16:27:13 -0700
Subject: [PATCH] ci/cirrus: disable selinux-dmz kludge for centos-stream-8

It now comes with container-selinux 2:2.224.0-1.module_el8+712+4cd1bd69,
so we only need the kludge for CentOS 7 (which, I guess, is the sole
reason why we have this kludge at all).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a3ee5b5b156..d23d36c7052 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -160,10 +160,10 @@ task:
     sed -e "s,PermitRootLogin.*,PermitRootLogin prohibit-password,g" -i /etc/ssh/sshd_config
     systemctl restart sshd
 
-    # Disable the dmz-vs-selinux workaround for distros that have container-selinux >= 2.224.0.
+    # Disable the dmz-vs-selinux workaround for distros that have
+    # container-selinux >= 2.224.0 (CentOS 7 does not have it).
     case $DISTRO in
-    # TODO: remove centos-stream-8.
-    centos-7|centos-stream-8)
+    centos-7)
       # Do nothing.
       ;;
     *)