From fb64935597e1dd3b36a8f045cb948590b716c6fb Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 26 May 2021 22:19:44 +0200
Subject: [PATCH] gitlab-ci: fix error evaluating "distro.always" in
 ci.template

  ...
  File "/usr/local/lib/python3.9/site-packages/jinja2/environment.py", line 1361, in generate
    yield self.environment.handle_exception()
  File "/usr/local/lib/python3.9/site-packages/jinja2/environment.py", line 925, in handle_exception
    raise rewrite_traceback_stack(source=source)
  File ".gitlab-ci/ci.template", line 178, in top-level template code
    {% if not version in distro.always and (distro.name != pages_build.name or version != pages_build.version) %}
  jinja2.exceptions.UndefinedError: 'dict object' has no attribute 'always'
---
 .gitlab-ci.yml         | 10 +++++-----
 .gitlab-ci/ci.template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 411a937279..70ce8f97d0 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-01-28.0-9831d9f49e57'
-  UBUNTU_TAG:  '2021-01-28.0-b88d09982586'
-  DEBIAN_TAG:  '2021-01-28.0-b88d09982586'
-  CENTOS_TAG:  '2021-01-28.0-9831d9f49e57'
-  ALPINE_TAG:  '2021-01-28.0-3913bcd6d86c'
+  FEDORA_TAG:  '2021-01-28.0-58fe33a4491f'
+  UBUNTU_TAG:  '2021-01-28.0-747962184ec4'
+  DEBIAN_TAG:  '2021-01-28.0-747962184ec4'
+  CENTOS_TAG:  '2021-01-28.0-58fe33a4491f'
+  ALPINE_TAG:  '2021-01-28.0-2436fa17a7d2'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index f195f2c981..ee28a32b07 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -175,7 +175,7 @@ t_{{distro.name}}:{{version}}:
     {% endif %}
   needs:
     - "{{distro.name}}:{{version}}@container-prep"
-{% if not version in distro.always and (distro.name != pages_build.name or version != pages_build.version) %}
+{% if not version in distro.get('always', []) and (distro.name != pages_build.name or version != pages_build.version) %}
   when: manual
 {% endif %}
 {% endfor %}