summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorricolin <rico.lin.guanyu@gmail.com>2021-02-23 16:49:34 +0800
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-05-17 07:03:58 +0000
commitea71584c6545b9f414635040188633046fb7e6fc (patch)
tree09f4cbdda09cb3424b3a0afbc2087f446afc331e
parent73c456f85b4e861e4be12282a67ca59f5f319357 (diff)
downloadkolla-ea71584c6545b9f414635040188633046fb7e6fc.tar.gz
kolla-ea71584c6545b9f414635040188633046fb7e6fc.zip
add openstack-python3-xena-jobs-arm64 job
This is a non-voting job to validate py3 unittests on AArch64 Also fixed test units to use source install type with Debian as Kolla does not support Debian/binary on !x86-64 Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Task: 41911 Story: 2007938 Change-Id: I6889555820adcaee8a86e70b5c3ea31c15e3192c
-rw-r--r--.zuul.d/project.yaml1
-rw-r--r--kolla/tests/test_build.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index f58b74536..b95f3e793 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -2,6 +2,7 @@
- project:
templates:
- openstack-python3-xena-jobs
+ - openstack-python3-xena-jobs-arm64
- check-requirements
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 10d70ce5a..3e9dd0634 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -370,6 +370,8 @@ class KollaWorkerTest(base.TestCase):
itertools.product(rh_base, rh_type),
itertools.product(deb_base, deb_type)):
self.conf.set_override('base', base_distro)
+ if base_distro == 'debian' and install_type == 'binary':
+ self.conf.set_override('base_arch', 'x86_64')
self.conf.set_override('install_type', install_type)
# should no exception raised
build.KollaWorker(self.conf)
@@ -528,6 +530,7 @@ class KollaWorkerTest(base.TestCase):
def test_build_distro_python_version_debian(self):
"""check distro_python_version for Debian"""
self.conf.set_override('base', 'debian')
+ self.conf.set_override('install_type', 'source')
kolla = build.KollaWorker(self.conf)
self.assertEqual('3.9', kolla.distro_python_version)
@@ -581,6 +584,7 @@ class KollaWorkerTest(base.TestCase):
def test_build_distro_package_manager_debian(self):
"""check distro_package_manager apt for debian"""
self.conf.set_override('base', 'debian')
+ self.conf.set_override('install_type', 'source')
kolla = build.KollaWorker(self.conf)
self.assertEqual('apt', kolla.distro_package_manager)
@@ -605,6 +609,7 @@ class KollaWorkerTest(base.TestCase):
def test_base_package_type_debian(self):
"""check base_package_type deb for debian"""
self.conf.set_override('base', 'debian')
+ self.conf.set_override('install_type', 'source')
kolla = build.KollaWorker(self.conf)
self.assertEqual('deb', kolla.base_package_type)