From cfde1d096e615627446c4c23fdd07c4c443373dd Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 13 Jan 2020 11:02:51 +0000 Subject: CentOS 8: Don't force tag in build jobs We should allow the tag set in kolla-build.conf to be used for the image tags, since our deploy jobs need to set it to change_XXXXXXX when images are built for the job. Change-Id: I705514ee0249ff1d309e280001d653271e3686af Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 8788a452a9ab7c1f3a94986c2a55e887d1530bbf) --- tests/templates/kolla-build.conf.j2 | 4 +++- tests/test_build.py | 10 ++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 37b06aca6..25afce62f 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -2,7 +2,9 @@ debug = true {% if publisher %} namespace = kolla -tag = {{ zuul.tag if zuul.pipeline == "release" else zuul.branch | basename }} +{# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #} +{% 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 logs_dir = {{ kolla_build_logs_dir }} diff --git a/tests/test_build.py b/tests/test_build.py index 6fdb4288c..38116d134 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -83,11 +83,10 @@ class BuildTestCentos8Binary(BuildTest, base.BaseTestCase): def setUp(self): super(BuildTestCentos8Binary, self).setUp() - # TODO(mgoddard): Remove --base-tag and --tag arguments when CentOS 8 - # is the default. + # TODO(mgoddard): Remove --base-tag argument when CentOS 8 is the + # default. self.build_args.extend(["--base", "centos", "--base-tag", "8", - "--tag", "master-centos8", "--type", "binary"]) @@ -95,11 +94,10 @@ class BuildTestCentos8Source(BuildTest, base.BaseTestCase): def setUp(self): super(BuildTestCentos8Source, self).setUp() - # TODO(mgoddard): Remove --base-tag and --tag arguments when CentOS 8 - # is the default. + # TODO(mgoddard): Remove --base-tag argument when CentOS 8 is the + # default. self.build_args.extend(["--base", "centos", "--base-tag", "8", - "--tag", "master-centos8", "--type", "source"]) -- cgit v1.2.3