diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-14 13:33:42 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-14 15:27:53 +0100 |
| commit | ca4da16836e4b3ef1d84059a63378c3f5bb2517e (patch) | |
| tree | d79b281e4075844e51b316125286e8cae1645bd8 | |
| parent | f91ddee1c18cf1000f190396ecee671708b88bdd (diff) | |
| download | kolla-ca4da16836e4b3ef1d84059a63378c3f5bb2517e.tar.gz kolla-ca4da16836e4b3ef1d84059a63378c3f5bb2517e.zip | |
Debian/source: do not force tag in build jobs
Multiarch publisher uses 'branch-arch' so set it in kolla-build.conf
file.
Change-Id: I1af17edc9671237d270c5c6fe70e4420199bdb02
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 1 | ||||
| -rw-r--r-- | tests/test_build.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 8a7bc4f20..f0e82ac21 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -4,6 +4,7 @@ debug = true namespace = kolla {# 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 = '-' ~ base_arch if base_distro == 'debian' and install_type == 'source' else '' %} tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }} {% endif %} push = false diff --git a/tests/test_build.py b/tests/test_build.py index 02f2b7a93..632931ee4 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -23,7 +23,6 @@ import testtools sys.path.append( os.path.abspath(os.path.join(os.path.dirname(__file__), '../tools'))) -from kolla.common import config # noqa from kolla.image import build # noqa LOG = logging.getLogger(__name__) @@ -130,7 +129,5 @@ class BuildTestDebianSource(BuildTest, base.BaseTestCase): def setUp(self): super(BuildTestDebianSource, self).setUp() - tag = '%s-%s' % (config.OPENSTACK_RELEASE['debian'], os.uname()[4]) self.build_args.extend(["--base", "debian", - "--tag", tag, "--type", "source"]) |