diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-02-05 14:20:45 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-05 14:20:45 +0000 |
| commit | 1c31fe9cd65ea1f9d52d91919ceef77a235e64c1 (patch) | |
| tree | 5e98682f15d7d2e7718e21423c84b49d6813074e /tests | |
| parent | 49445b68f8e195f4db7aebe972415d1d620665dc (diff) | |
| download | kolla-1c31fe9cd65ea1f9d52d91919ceef77a235e64c1.tar.gz kolla-1c31fe9cd65ea1f9d52d91919ceef77a235e64c1.zip | |
CentOS 8: Fix CentOS 7 publisher tag
Currently we use CentOS 8 nodepool images for all CI build jobs. This
means we can't use the ansible_distribution_major_version fact to detect
whether we are building CentOS 7 or 8 images. Due to this, all CentOS
images (including CentOS 7) are currently published with a
'master-centos8' tag.
This change fixes the issue by using the base_tag variable which is
defined for CentOS 8 build jobs.
Change-Id: I29b7b8ee742120107a11bd419ac58ab5c09b0b75
Partially-Implements: blueprint centos-rhel-8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 47650bb58..25afce62f 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -3,7 +3,7 @@ debug = true {% if publisher %} namespace = kolla {# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #} -{% set tag_suffix = '-centos8' if ansible_distribution | lower == 'centos' and ansible_distribution_major_version == '8' else '' %} +{% set tag_suffix = '-centos8' if ansible_distribution | lower == 'centos' and base_tag | default == 8 else '' %} tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }} {% endif %} push = false |