From 126beb8a588607c055d5cb517a31501ab7ea17bd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 4 Jan 2022 21:51:32 +0100
Subject: [PATCH] gitlab-ci: replace rawhide with f35 for gitlab-ci

This is a stale branch. We don't want to test it against rawhide,
because that is a moving target and keeps changing. Instead use Fedora
35.
---
 .gitlab-ci.yml        | 24 ++++++++++++------------
 .gitlab-ci/config.yml |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b053de287..10e20a3e81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,11 +47,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bump
   # ".default_tag".
-  FEDORA_TAG:  '2021-07-12.0-ce2fde13c082'
-  UBUNTU_TAG:  '2021-07-12.0-03cf2b545306'
-  DEBIAN_TAG:  '2021-07-12.0-03cf2b545306'
-  CENTOS_TAG:  '2021-07-12.0-ce2fde13c082'
-  ALPINE_TAG:  '2021-07-12.0-deabecd7cba6'
+  FEDORA_TAG:  '2021-07-12.0-d4c78c08d9d0'
+  UBUNTU_TAG:  '2021-07-12.0-5cf970042e30'
+  DEBIAN_TAG:  '2021-07-12.0-5cf970042e30'
+  CENTOS_TAG:  '2021-07-12.0-d4c78c08d9d0'
+  ALPINE_TAG:  '2021-07-12.0-60385e44c795'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@@ -134,13 +134,13 @@ fedora:34@container-prep:
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
-fedora:rawhide@container-prep:
+fedora:35@container-prep:
   extends:
     - .fdo.container-build@fedora
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
@@ -393,13 +393,13 @@ fedora:34@container-clean:
     FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:rawhide@container-clean:
+fedora:35@container-clean:
   extends:
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 ubuntu:16.04@container-clean:
@@ -630,15 +630,15 @@ t_fedora:34:
   needs:
     - "fedora:34@container-prep"
 
-t_fedora:rawhide:
+t_fedora:35:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:rawhide@container-prep"
+    - "fedora:35@container-prep"
   when: manual
 
 t_ubuntu:16.04:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index f8bb9404d0..5ea0e02e42 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -23,7 +23,7 @@ distributions:
       - '32'
       - '33'
       - '34'
-      - 'rawhide'
+      - '35'
     # always:
     #   - '33'
   - name: ubuntu