From 1c31fe9cd65ea1f9d52d91919ceef77a235e64c1 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 5 Feb 2020 14:20:45 +0000 Subject: [PATCH] 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 --- tests/templates/kolla-build.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 47650bb588..25afce62f4 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