gitlab-ci: update default Fedora image for building pages and check steps

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

Also, we now use clang-format from Fedora 38 release, so the default
image in gitlab-ci must match, because that image is used for the
"check-tree" test.

While at it, add Fedora 39 and move Fedora 36 to tier 3.

.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-a093d6371bfe'
-  CENTOS_TAG:  'tag-b353b5cc34d6'
-  DEBIAN_TAG:  'tag-2d5f18a2ec1a'
-  FEDORA_TAG:  'tag-b353b5cc34d6'
-  UBUNTU_TAG:  'tag-2d5f18a2ec1a'
+  ALPINE_TAG:  'tag-8399f83819ed'
+  CENTOS_TAG:  'tag-a5e8e3d94c70'
+  DEBIAN_TAG:  'tag-f97319c5ab59'
+  FEDORA_TAG:  'tag-a5e8e3d94c70'
+  UBUNTU_TAG:  'tag-f97319c5ab59'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -96,7 +96,17 @@ variables:
 # Build a container for each distribution + version. The ci-templates
 # will re-use the containers if the tag doesn't change.
 
-tier1:fedora:37@prep:
+tier1:fedora:38@prep:
+  extends:
+    - .fdo.container-build@fedora
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
+
+tier2:fedora:37@prep:
   extends:
     - .fdo.container-build@fedora
   stage: prep
@@ -105,25 +115,15 @@ tier1:fedora:37@prep:
     FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-
-tier2:fedora:36@prep:
-  extends:
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '36'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
   when: manual
 
-tier2:fedora:38@prep:
+tier2:fedora:39@prep:
   extends:
     - .fdo.container-build@fedora
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
   when: manual
@@ -194,6 +194,17 @@ tier3:fedora:35@prep:
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
   when: manual
 
+tier3:fedora:36@prep:
+  extends:
+    - .fdo.container-build@fedora
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
+  when: manual
+
 tier2:ubuntu:18.04@prep:
   extends:
     - .fdo.container-build@ubuntu
@@ -419,7 +430,7 @@ tier2:alpine:latest@prep:
   dependencies: []
 
 
-t_fedora:37:
+t_fedora:38:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
@@ -436,35 +447,35 @@ t_fedora:37:
         - rpm+meson
         - tarball
         - subtree
-  variables:
-    FDO_DISTRIBUTION_VERSION: '37'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "tier1:fedora:37@prep"
-
-t_fedora:36:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-    - .nm_artifacts_debug
-  stage: tier2
-  variables:
-    FDO_DISTRIBUTION_VERSION: '36'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "tier2:fedora:36@prep"
-
-t_fedora:38:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-    - .nm_artifacts_debug
-  stage: tier2
   variables:
     FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "tier2:fedora:38@prep"
+    - "tier1:fedora:38@prep"
+
+t_fedora:37:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
+  stage: tier2
+  variables:
+    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+  needs:
+    - "tier2:fedora:37@prep"
+
+t_fedora:39:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
+  stage: tier2
+  variables:
+    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+  needs:
+    - "tier2:fedora:39@prep"
 
 t_fedora:30:
   extends:
@@ -538,6 +549,18 @@ t_fedora:35:
   needs:
     - "tier3:fedora:35@prep"
 
+t_fedora:36:
+  extends:
+    - .build@template
+    - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
+  stage: tier3
+  variables:
+    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+  needs:
+    - "tier3:fedora:36@prep"
+
 t_ubuntu:18.04:
   extends:
     - .build@template
@@ -776,10 +799,10 @@ check-patch:
   extends:
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "tier1:fedora:37@prep"
+    - "tier1:fedora:38@prep"
   stage: tier1
   script:
     - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
@@ -789,10 +812,10 @@ check-tree:
   extends:
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "tier1:fedora:37@prep"
+    - "tier1:fedora:38@prep"
   stage: tier1
   script:
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check
@@ -811,9 +834,9 @@ pages:
   only:
     - main
   dependencies:
-    - "t_fedora:37: [autotools+gcc+docs+valgrind]"
+    - "t_fedora:38: [autotools+gcc+docs+valgrind]"
   needs:
-    - "t_fedora:37: [autotools+gcc+docs+valgrind]"
+    - "t_fedora:38: [autotools+gcc+docs+valgrind]"
 
 triage:issues:
   stage: triage

.gitlab-ci/config.yml

@@ -22,12 +22,12 @@ distributions:
     # The first tier:1 in the list is used to build the pages and check-{tree,patch}
     tier: 1
     versions:
-      - '37'
+      - '38'
   - name: fedora
     tier: 2
     versions:
-      - '36'
-      - '38'
+      - '37'
+      - '39'
   - name: fedora
     tier: 3
     versions:
@@ -37,6 +37,7 @@ distributions:
       - '33'
       - '34'
       - '35'
+      - '36'
   - name: ubuntu
     tier: 2
     versions: