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'
This commit is contained in:
Thomas Haller 2021-05-26 22:19:44 +02:00
parent 7e581a0303
commit fb64935597
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 6 additions and 6 deletions

View file

@ -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'

View file

@ -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 %}