openstack
/
kolla
Code Issues Proposed changes

Merge "CentOS 8: Don't force tag in build jobs"

This commit is contained in:
Zuul 2020-01-14 14:16:56 +00:00 committed by Gerrit Code Review
parent 3b02eae864 8788a452a9
commit f91ddee1c1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/templates/kolla-build.conf.j2
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 }}

10
tests/test_build.py
View File

@ -84,11 +84,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"])
@ -96,11 +95,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"])