From 901f0bdeb3a8b21720c7f12b9bf85bcac36e0275 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 4 May 2021 15:20:10 +0200
Subject: [PATCH] gitlab-ci: fix running Fedora 34 test by default

- the container that is also "pages_build" should always
  run automatically. This can replace the "always" tag.

- comment out the "always: 33" part, because we no longer need
  it. It was also wrong, because by now we should run Fedora 34
  automatically.
---
 .gitlab-ci.yml         | 17 ++++++++++-------
 .gitlab-ci/ci.template |  7 +++++--
 .gitlab-ci/config.yml  |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9913c9d353..ec40879472 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,14 +41,17 @@ stages:
 variables:
   FDO_UPSTREAM_REPO: NetworkManager/NetworkManager
   GIT_DEPTH: 1
-  # these tags should be updated each time the list of packages is updated
+  # These tags should be updated each time the list of packages is updated
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular NM version
-  FEDORA_TAG:  '2021-01-28.0-bda9933006ae'
-  UBUNTU_TAG:  '2021-01-28.0-418bdf37a634'
-  DEBIAN_TAG:  '2021-01-28.0-418bdf37a634'
-  CENTOS_TAG:  '2021-01-28.0-bda9933006ae'
-  ALPINE_TAG:  '2021-01-28.0-50c3effca8f8'
+  #
+  # This is done by running `ci-fairy generate-template` and possibly bump
+  # ".default_tag".
+  FEDORA_TAG:  '2021-01-28.0-dd8fdd44b6a7'
+  UBUNTU_TAG:  '2021-01-28.0-b88d09982586'
+  DEBIAN_TAG:  '2021-01-28.0-b88d09982586'
+  CENTOS_TAG:  '2021-01-28.0-dd8fdd44b6a7'
+  ALPINE_TAG:  '2021-01-28.0-3913bcd6d86c'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@@ -674,6 +677,7 @@ t_fedora:33:
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
     - "fedora:33@container-prep"
+  when: manual
 
 t_fedora:34:
   extends:
@@ -685,7 +689,6 @@ t_fedora:34:
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
     - "fedora:34@container-prep"
-  when: manual
 
 t_fedora:rawhide:
   extends:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 8ee2c89541..f195f2c981 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -29,9 +29,12 @@ stages:
 variables:
   FDO_UPSTREAM_REPO: NetworkManager/NetworkManager
   GIT_DEPTH: 1
-  # these tags should be updated each time the list of packages is updated
+  # These tags should be updated each time the list of packages is updated
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular NM version
+  #
+  # This is done by running `ci-fairy generate-template` and possibly bump
+  # ".default_tag".
 {% for distro in distributions %}
   {{"%-13s"| format(distro.name.upper() + '_TAG:')}}'{{distro.tag}}-{{
     (ci_fairy.hashfiles('./.gitlab-ci/config.yml',
@@ -172,7 +175,7 @@ t_{{distro.name}}:{{version}}:
     {% endif %}
   needs:
     - "{{distro.name}}:{{version}}@container-prep"
-{% if not version in distro.always %}
+{% if not version in distro.always and (distro.name != pages_build.name or version != pages_build.version) %}
   when: manual
 {% endif %}
 {% endfor %}
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index eee5cdba3a..e7af5f6bca 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -26,8 +26,8 @@ distributions:
       - '33'
       - '34'
       - 'rawhide'
-    always:
-      - '33'
+    # always:
+    #   - '33'
   - name: ubuntu
     tag: *default_tag
     base_type: debian