diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-22 19:29:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-22 19:29:58 +0000 |
| commit | 1167be2d2f1ba91cdb6ece78d785b6721dc8e6c9 (patch) | |
| tree | 8c433e72284d167d6eac7b9c46ecb5cd0ccb6680 | |
| parent | a80de4a7926ab9188191505a86c24fe6db3fbb75 (diff) | |
| parent | ea71584c6545b9f414635040188633046fb7e6fc (diff) | |
| download | kolla-1167be2d2f1ba91cdb6ece78d785b6721dc8e6c9.tar.gz kolla-1167be2d2f1ba91cdb6ece78d785b6721dc8e6c9.zip | |
Merge "add openstack-python3-xena-jobs-arm64 job"
| -rw-r--r-- | .zuul.d/project.yaml | 1 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 5 |
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) |