From b780f9315c97ca886fccd23b9c3f1a012d76ba67 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 9 Nov 2020 10:32:42 +0100
Subject: [PATCH] gitlab-ci: generate pages on Fedora 33 image

On one image we do extra work, like generating documentation (gitlab-pages).
The same image is currently also used for the "checkpatch" step. That step
checks code formatting using clang-format. The formatting depends on the
clang version, and we currently choose Fedora 33 as the desired version
for formatting.

It means, the "checkpatch" step requires Fedora 33. We could choose a
different image for generating pages and run check patch. However, that
might not be best. Just also generate the pages using Fedora 33.
---
 .gitlab-ci.yml        | 6 +++---
 .gitlab-ci/config.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0781f298e..7340a1c60b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -546,7 +546,6 @@ t_fedora:32:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
-    - .nm_artifacts
   variables:
     FDO_DISTRIBUTION_VERSION: '32'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -557,6 +556,7 @@ t_fedora:33:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts
   variables:
     FDO_DISTRIBUTION_VERSION: '33'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -750,7 +750,7 @@ t_centos:8.1.1911:
 #################################################################
 checkpatch:
   extends:
-   - t_fedora:32
+   - t_fedora:33
   stage: test
   script:
     - date '+%Y%m%d-%H%M%S'; dnf install -y git black gettext /usr/bin/xargs which clang
@@ -771,7 +771,7 @@ pages:
   only:
     - master
   dependencies:
-    - t_fedora:32
+    - t_fedora:33
 
 triage:issues:
   stage: triage
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 1e0d2b0b46..299b8a818d 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -52,4 +52,4 @@ distributions:
 # specifies which of the above distros is used as source for pages
 pages_build:
   name: fedora
-  version: '32'
+  version: '33'