From 941f998792157276c7531487d7e056cefd6dbc8d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 19 Nov 2022 11:14:54 +0100
Subject: [PATCH] gitlab-ci: update default Fedora image for building pages and
 check steps

We want to follow current Fedora, so update to f37.

Also, we now use clang-format from Fedora 37 release, so the default
image in gitlab-ci must match, because that image is used for the
"check-tree" test.
---
 .gitlab-ci.yml        | 28 ++++++++++++++--------------
 .gitlab-ci/config.yml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2ed576c2e..0016cf4c34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,11 +48,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  FEDORA_TAG:  '2022-10-07.0-55ff1429889e'
-  UBUNTU_TAG:  '2022-10-07.0-f43ecfa19992'
-  DEBIAN_TAG:  '2022-10-07.0-f43ecfa19992'
-  CENTOS_TAG:  '2022-10-07.0-55ff1429889e'
-  ALPINE_TAG:  '2022-10-07.0-5aae55ae295b'
+  FEDORA_TAG:  '2022-10-07.0-75e43eda0912'
+  UBUNTU_TAG:  '2022-10-07.0-a0df5d1804c4'
+  DEBIAN_TAG:  '2022-10-07.0-a0df5d1804c4'
+  CENTOS_TAG:  '2022-10-07.0-75e43eda0912'
+  ALPINE_TAG:  '2022-10-07.0-a5ef6173593f'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@@ -755,24 +755,24 @@ t_fedora:36:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
-    - .nm_artifacts
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
     - "fedora:36@container-prep"
+  when: manual
 
 t_fedora:37:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
-    - .nm_artifacts_debug
+    - .nm_artifacts
   variables:
     FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
     - "fedora:37@container-prep"
-  when: manual
 
 t_fedora:38:
   extends:
@@ -1024,10 +1024,10 @@ check-patch:
   extends:
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:36@container-prep"
+    - "fedora:37@container-prep"
   stage: test
   script:
     - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
@@ -1037,10 +1037,10 @@ check-tree:
   extends:
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:36@container-prep"
+    - "fedora:37@container-prep"
   stage: test
   script:
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check
@@ -1059,9 +1059,9 @@ pages:
   only:
     - main
   dependencies:
-    - t_fedora:36
+    - t_fedora:37
   needs:
-    - t_fedora:36
+    - t_fedora:37
 
 triage:issues:
   stage: triage
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index b52c0e3e67..3a9f45905b 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -66,4 +66,4 @@ distributions:
 # specifies which of the above distros is used as source for pages
 pages_build:
   name: fedora
-  version: '36'
+  version: '37'