openstack/kolla
Code Issues Proposed changes

Merge "Debian/source: do not force tag in build jobs"

Browse Source
This commit is contained in:
Zuul 2020-01-15 11:19:52 +00:00 committed by Gerrit Code Review
commit b6f7e69502
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/templates/kolla-build.conf.j2
View File

@ -4,6 +4,7 @@ debug = true
namespace = kolla namespace = kolla
{# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #} {# 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 '' %} {% set tag_suffix = '-centos8' if ansible_distribution == 'centos' and ansible_distribution_major_version == '8' else '' %}
{% set tag_suffix = '-' ~ base_arch if base_distro == 'debian' and install_type == 'source' else '' %}
tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }} tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
{% endif %} {% endif %}
push = false push = false

3
tests/test_build.py
View File

@ -23,7 +23,6 @@ import testtools
sys.path.append( sys.path.append(
os.path.abspath(os.path.join(os.path.dirname(__file__), '../tools'))) os.path.abspath(os.path.join(os.path.dirname(__file__), '../tools')))
from kolla.common import config # noqa
from kolla.image import build # noqa from kolla.image import build # noqa
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -130,7 +129,5 @@ class BuildTestDebianSource(BuildTest, base.BaseTestCase):
def setUp(self): def setUp(self):
super(BuildTestDebianSource, self).setUp() super(BuildTestDebianSource, self).setUp()
tag = '%s-%s' % (config.OPENSTACK_RELEASE['debian'], os.uname()[4])
self.build_args.extend(["--base", "debian", self.build_args.extend(["--base", "debian",
"--tag", tag,
"--type", "source"]) "--type", "source"])