diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-14 14:16:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-14 14:16:56 +0000 |
| commit | f91ddee1c18cf1000f190396ecee671708b88bdd (patch) | |
| tree | 516b70fa97d5f857947d0fefb35c0581cf7bcc07 | |
| parent | 3b02eae864a85ec4796f32ea111edbbb30a009b0 (diff) | |
| parent | 8788a452a9ab7c1f3a94986c2a55e887d1530bbf (diff) | |
| download | kolla-f91ddee1c18cf1000f190396ecee671708b88bdd.tar.gz kolla-f91ddee1c18cf1000f190396ecee671708b88bdd.zip | |
Merge "CentOS 8: Don't force tag in build jobs"
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 4 | ||||
| -rw-r--r-- | 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..8a7bc4f20 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 == '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 }} diff --git a/tests/test_build.py b/tests/test_build.py index a312662b2..02f2b7a93 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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"]) |