From 66636370f9325388e72c3b7f5f1b2a873f0f2c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
Date: Wed, 21 Aug 2024 08:56:06 +0200
Subject: [PATCH 1/2] debian: install polkitd instead of policykit-1

Commit c19b5d76c2c4 ('contrib: install "policykit-1" package on Debian')
added policykit-1 because it was needed to get a translation file.

In recent Debian versions it has been removed. It was only a
transitional package to install polkitd and pkexec. Install polkitd
directly instead.
---
 contrib/debian/REQUIRED_PACKAGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES
index 8e68bba35c..88fd493235 100755
--- a/contrib/debian/REQUIRED_PACKAGES
+++ b/contrib/debian/REQUIRED_PACKAGES
@@ -71,7 +71,7 @@ install \
     meson \
     mobile-broadband-provider-info \
     pkg-config \
-    policykit-1 \
+    polkitd \
     ppp \
     ppp-dev \
     python3-dbus \

From afefa1acde49d1270a257fac441d9b67db920b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
Date: Wed, 21 Aug 2024 09:00:05 +0200
Subject: [PATCH 2/2] ci: remove CentOS Stream 8 (EOLd)

It even fails to download the image.
---
 .gitlab-ci.yml        | 38 +++++---------------------------------
 .gitlab-ci/config.yml |  4 ----
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74cfcf3390..9455e108d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-002928e49e27'
-  CENTOS_TAG:  'tag-15f80c990684'
-  DEBIAN_TAG:  'tag-1ce75d18715e'
-  FEDORA_TAG:  'tag-15f80c990684'
-  UBUNTU_TAG:  'tag-1ce75d18715e'
+  ALPINE_TAG:  'tag-961e70a41177'
+  CENTOS_TAG:  'tag-fe6805b2c8f4'
+  DEBIAN_TAG:  'tag-f95b2e33bdf7'
+  FEDORA_TAG:  'tag-fe6805b2c8f4'
+  UBUNTU_TAG:  'tag-f95b2e33bdf7'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -294,20 +294,6 @@ tier3:debian:oldstable@prep:
       when: manual
       allow_failure: true
 
-tier3:centos:stream8@prep:
-  extends:
-    - .fdo.container-build@centos
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: 'stream8'
-    FDO_DISTRIBUTION_TAG: $CENTOS_TAG
-    FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
-  rules:
-    - if: $CI_PIPELINE_SOURCE != 'schedule'
-      when: manual
-      allow_failure: true
-
 tier3:alpine:latest@prep:
   extends:
     - .fdo.container-build@alpine
@@ -543,20 +529,6 @@ t_debian:oldstable:
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
 
-t_centos:stream8:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@centos
-    - .nm_artifacts_debug
-  stage: tier3
-  variables:
-    FDO_DISTRIBUTION_VERSION: 'stream8'
-    FDO_DISTRIBUTION_TAG: $CENTOS_TAG
-  needs:
-    - "tier3:centos:stream8@prep"
-  rules:
-    - if: $CI_PIPELINE_SOURCE != 'schedule'
-
 t_alpine:latest:
   extends:
     - .build@template
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index c0f3538342..05b19c1ccb 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -67,10 +67,6 @@ distributions:
     versions:
       - 'stable'
       - 'oldstable'
-  - name: centos
-    tier: 3
-    versions:
-      - 'stream8'
   - name: alpine
     tier: 3
     versions: