diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-23 10:01:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-23 10:01:57 +0000 |
| commit | 46b82a2a77e9749e370a27edf2d48b5f3cc417a1 (patch) | |
| tree | 0c18d551dd724ce931be372506c5c93a670dd57e /kolla | |
| parent | a7135c9e15b4ec919f971afa0821752c692d6247 (diff) | |
| parent | 1cda1acc7fd22bc42917c723f14c6ee076098297 (diff) | |
| download | kolla-46b82a2a77e9749e370a27edf2d48b5f3cc417a1.tar.gz kolla-46b82a2a77e9749e370a27edf2d48b5f3cc417a1.zip | |
Merge "Switch to Dynamic Python Version Detection"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/image/kolla_worker.py | 8 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 18 |
2 files changed, 0 insertions, 26 deletions
diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py index b959ec754..a464d2113 100644 --- a/kolla/image/kolla_worker.py +++ b/kolla/image/kolla_worker.py @@ -114,20 +114,14 @@ class KollaWorker(object): self.rpm_setup = self.build_rpm_setup(rpm_setup_config) if self.base in ['centos', 'rocky']: - self.conf.distro_python_version = "3.9" self.distro_package_manager = 'dnf' self.base_package_type = 'rpm' elif self.base in ['debian']: - self.conf.distro_python_version = "3.11" self.distro_package_manager = 'apt' self.base_package_type = 'deb' elif self.base in ['ubuntu']: - self.conf.distro_python_version = "3.10" self.distro_package_manager = 'apt' self.base_package_type = 'deb' - else: - # Assume worst - self.conf.distro_python_version = "3.8" if self.conf.distro_package_manager is not None: self.distro_package_manager = self.conf.distro_package_manager @@ -147,7 +141,6 @@ class KollaWorker(object): self.image_statuses_unbuildable = dict() self.image_statuses_allowed_to_fail = dict() self.maintainer = conf.maintainer - self.distro_python_version = conf.distro_python_version try: self.engine_client = engine.getEngineClient(self.conf) @@ -326,7 +319,6 @@ class KollaWorker(object): 'kolla_version': kolla_version, 'image_name': image_name, 'users': self.get_users(), - 'distro_python_version': self.distro_python_version, 'distro_package_manager': self.distro_package_manager, 'rpm_setup': self.rpm_setup, 'build_date': build_date, diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index afbfe009c..9b3719c07 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -661,24 +661,6 @@ class KollaWorkerTest(base.TestCase): kolla = build.KollaWorker(self.conf) self.assertEqual(2, len(kolla.rpm_setup)) - def test_build_distro_python_version_debian(self): - """check distro_python_version for Debian""" - self.conf.set_override('base', 'debian') - kolla = build.KollaWorker(self.conf) - self.assertEqual('3.11', kolla.distro_python_version) - - def test_build_distro_python_version_ubuntu(self): - """check distro_python_version for Ubuntu""" - self.conf.set_override('base', 'ubuntu') - kolla = build.KollaWorker(self.conf) - self.assertEqual('3.10', kolla.distro_python_version) - - def test_build_distro_python_version_centos(self): - """check distro_python_version for CentOS Stream 9""" - self.conf.set_override('base', 'centos') - kolla = build.KollaWorker(self.conf) - self.assertEqual('3.9', kolla.distro_python_version) - def test_build_distro_package_manager(self): """check distro_package_manager conf value is taken""" self.conf.set_override('distro_package_manager', 'foo') |