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
This commit is contained in:
Mark Goddard 2020-01-13 11:02:51 +00:00
parent e2f013357b
commit 8788a452a9
2 changed files with 7 additions and 7 deletions

View File

@ -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 == 'centos' and ansible_distribution_major_version == '8' else '' %}
tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
{% endif %}
push = false
logs_dir = {{ kolla_build_logs_dir }}

View File

@ -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"])