From af623592f86f1cade2f0b10daf95e4f536f56b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
Date: Tue, 24 Dec 2024 14:03:06 +0100
Subject: [PATCH] ci: update distros

Remove EOL'd, add new versions recently released.
---
 .gitlab-ci.yml              | 86 ++++++++++++++++++-------------------
 .gitlab-ci/config.yml       |  6 +--
 .gitlab-ci/distros-info.yml | 13 +++---
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 396cbd3fe..2ed8213a1 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-0959c37ef19b'
-  CENTOS_TAG:  'tag-70ac400f2325'
-  DEBIAN_TAG:  'tag-c03f6a5793ce'
-  FEDORA_TAG:  'tag-70ac400f2325'
-  UBUNTU_TAG:  'tag-c03f6a5793ce'
+  ALPINE_TAG:  'tag-490e97b0b9c7'
+  CENTOS_TAG:  'tag-4a2c52092329'
+  DEBIAN_TAG:  'tag-aef8f2fd2198'
+  FEDORA_TAG:  'tag-4a2c52092329'
+  UBUNTU_TAG:  'tag-aef8f2fd2198'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -212,15 +212,15 @@ tier3:fedora:40@prep:
       when: manual
       allow_failure: true
 
-tier3:fedora:39@prep:
+tier3:ubuntu:24.10@prep:
   extends:
-    - .fdo.container-build@fedora
+    - .fdo.container-build@ubuntu
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '39'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
+    FDO_DISTRIBUTION_VERSION: '24.10'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+    FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
       when: manual
@@ -282,6 +282,20 @@ tier3:debian:12@prep:
       when: manual
       allow_failure: true
 
+tier3:alpine:3.21@prep:
+  extends:
+    - .fdo.container-build@alpine
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '3.21'
+    FDO_DISTRIBUTION_TAG: $ALPINE_TAG
+    FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC
+  rules:
+    - if: $CI_PIPELINE_SOURCE != 'schedule'
+      when: manual
+      allow_failure: true
+
 tier3:alpine:3.20@prep:
   extends:
     - .fdo.container-build@alpine
@@ -324,20 +338,6 @@ tier3:alpine:3.18@prep:
       when: manual
       allow_failure: true
 
-tier3:alpine:3.17@prep:
-  extends:
-    - .fdo.container-build@alpine
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '3.17'
-    FDO_DISTRIBUTION_TAG: $ALPINE_TAG
-    FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC
-  rules:
-    - if: $CI_PIPELINE_SOURCE != 'schedule'
-      when: manual
-      allow_failure: true
-
 #################################################################
 #                                                               #
 # tierN stage                                                   #
@@ -475,17 +475,17 @@ t_fedora:40:
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
 
-t_fedora:39:
+t_ubuntu:24.10:
   extends:
     - .build@template
-    - .fdo.distribution-image@fedora
+    - .fdo.distribution-image@ubuntu
     - .nm_artifacts_debug
   stage: tier3
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+    FDO_DISTRIBUTION_VERSION: '24.10'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
   needs:
-    - "tier3:fedora:39@prep"
+    - "tier3:ubuntu:24.10@prep"
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
 
@@ -545,6 +545,20 @@ t_debian:12:
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
 
+t_alpine:3.21:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@alpine
+    - .nm_artifacts_debug
+  stage: tier3
+  variables:
+    FDO_DISTRIBUTION_VERSION: '3.21'
+    FDO_DISTRIBUTION_TAG: $ALPINE_TAG
+  needs:
+    - "tier3:alpine:3.21@prep"
+  rules:
+    - if: $CI_PIPELINE_SOURCE != 'schedule'
+
 t_alpine:3.20:
   extends:
     - .build@template
@@ -587,20 +601,6 @@ t_alpine:3.18:
   rules:
     - if: $CI_PIPELINE_SOURCE != 'schedule'
 
-t_alpine:3.17:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@alpine
-    - .nm_artifacts_debug
-  stage: tier3
-  variables:
-    FDO_DISTRIBUTION_VERSION: '3.17'
-    FDO_DISTRIBUTION_TAG: $ALPINE_TAG
-  needs:
-    - "tier3:alpine:3.17@prep"
-  rules:
-    - if: $CI_PIPELINE_SOURCE != 'schedule'
-
 #################################################################
 #                                                               #
 # specific jobs                                                 #
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index e7b485fcd..39607308a 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -55,10 +55,10 @@ distributions:
     tier: 3
     versions:
       - '40'
-      - '39'
   - name: ubuntu
     tier: 3
     versions:
+      - '24.10'
       - '24.04'
       - '22.04'
       - '20.04'
@@ -69,7 +69,7 @@ distributions:
   - name: alpine
     tier: 3
     versions:
+      - '3.21'
       - '3.20'
       - '3.19'
-      - '3.18'
-      - '3.17'
\ No newline at end of file
+      - '3.18'
\ No newline at end of file
diff --git a/.gitlab-ci/distros-info.yml b/.gitlab-ci/distros-info.yml
index 831085aca..d96ec1258 100644
--- a/.gitlab-ci/distros-info.yml
+++ b/.gitlab-ci/distros-info.yml
@@ -15,9 +15,6 @@ fedora:
 - version: 40
   support: 2025-05-13
   nm: 1.46
-- version: 39
-  support: 2024-11-12
-  nm: 1.44
 
 # CentOS Stream
 centos:
@@ -80,6 +77,10 @@ ubuntu:
 - version: devel
   support: yes
   nm: main
+- version: 24.10
+  name: oracular
+  support: 2025-07-10
+  nm: 1.48
 - version: 24.04
   name: noble
   support: 2029-05-31
@@ -130,6 +131,9 @@ alpine:
 - version: edge
   support: yes
   nm: main
+- version: 3.21
+  support: 2026-11-01
+  nm: 1.50
 - version: 3.20
   support: 2026-04-01
   nm: 1.46
@@ -139,6 +143,3 @@ alpine:
 - version: 3.18
   support: 2025-05-09
   nm: 1.42
-- version: 3.17
-  support: 2024-11-22
-  nm: 1.40