From c80076c50104f0f3f76b8aa1ae7cd5a555d97900 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 22 May 2023 13:54:57 +0200
Subject: [PATCH] gitlab-ci: add CentOS Stream 8+9 containers

---
 .gitlab-ci.yml        | 56 +++++++++++++++++++++++++++++++++++++++----
 .gitlab-ci/config.yml |  2 ++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69a4eb1b06..193eac8eba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,11 +56,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-8399f83819ed'
-  CENTOS_TAG:  'tag-7405a4b74c04'
-  DEBIAN_TAG:  'tag-f97319c5ab59'
-  FEDORA_TAG:  'tag-7405a4b74c04'
-  UBUNTU_TAG:  'tag-f97319c5ab59'
+  ALPINE_TAG:  'tag-17df8b214d94'
+  CENTOS_TAG:  'tag-39222307a199'
+  DEBIAN_TAG:  'tag-7daf9b9bc6e4'
+  FEDORA_TAG:  'tag-39222307a199'
+  UBUNTU_TAG:  'tag-7daf9b9bc6e4'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -359,6 +359,28 @@ tier2:centos:8.3.2011@prep:
     FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
   when: manual
 
+tier2: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
+  when: manual
+
+tier2:centos:stream9@prep:
+  extends:
+    - .fdo.container-build@centos
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: 'stream9'
+    FDO_DISTRIBUTION_TAG: $CENTOS_TAG
+    FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
+  when: manual
+
 tier3:centos:7.6.1810@prep:
   extends:
     - .fdo.container-build@centos
@@ -729,6 +751,30 @@ t_centos:8.3.2011:
   needs:
     - "tier2:centos:8.3.2011@prep"
 
+t_centos:stream8:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
+  stage: tier2
+  variables:
+    FDO_DISTRIBUTION_VERSION: 'stream8'
+    FDO_DISTRIBUTION_TAG: $CENTOS_TAG
+  needs:
+    - "tier2:centos:stream8@prep"
+
+t_centos:stream9:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
+  stage: tier2
+  variables:
+    FDO_DISTRIBUTION_VERSION: 'stream9'
+    FDO_DISTRIBUTION_TAG: $CENTOS_TAG
+  needs:
+    - "tier2:centos:stream9@prep"
+
 t_centos:7.6.1810:
   extends:
     - .build@template
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index abffac8308..1bbd698b94 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -64,6 +64,8 @@ distributions:
       - '7.9.2009'
       - '8.1.1911'
       - '8.3.2011'
+      - 'stream8'
+      - 'stream9'
   - name: centos
     tier: 3
     versions: