aboutsummaryrefslogtreecommitdiff
path: root/kolla/tests
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-11 12:32:19 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-14 19:08:36 +0000
commit1b697cc69bc37df86b4ba27924732d01a710096c (patch)
treef6ca7b573f7bfcd37a70f6aa6b9a37ae503caf00 /kolla/tests
parentc4fda7baa3ffc36b555c32a34a00042b6035b917 (diff)
downloadkolla-1b697cc69bc37df86b4ba27924732d01a710096c.tar.gz
kolla-1b697cc69bc37df86b4ba27924732d01a710096c.zip
drop install_type almost everywhere
The only place where it stays is argument parsing where it gets ignored. Hardcoded to 'source' to make merging both kolla and kolla-ansible changes easier. Change-Id: I6890a7ec7baf507f8acd75b42bbd0fb17c2e4511 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/837620
Diffstat (limited to 'kolla/tests')
-rw-r--r--kolla/tests/test_build.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 0dac5ecb6..78be9c775 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -373,9 +373,6 @@ class KollaWorkerTest(base.TestCase):
build.KollaWorker(self.conf)
def test_build_image_list_adds_plugins(self):
-
- self.conf.set_override('install_type', 'source')
-
kolla = build.KollaWorker(self.conf)
kolla.setup_working_dir()
kolla.find_dockerfiles()
@@ -401,8 +398,6 @@ class KollaWorkerTest(base.TestCase):
self.fail('Can not find the expected neutron arista plugin')
def test_build_image_list_skips_disabled_plugins(self):
-
- self.conf.set_override('install_type', 'source')
self.conf.set_override('enabled', False,
'neutron-base-plugin-networking-baremetal')
@@ -426,8 +421,6 @@ class KollaWorkerTest(base.TestCase):
def test_build_image_list_plugin_parsing(self):
"""Ensure regex used to parse plugins adds them to the correct image"""
- self.conf.set_override('install_type', 'source')
-
kolla = build.KollaWorker(self.conf)
kolla.setup_working_dir()
kolla.find_dockerfiles()
@@ -443,7 +436,6 @@ class KollaWorkerTest(base.TestCase):
self.fail('Expected to find the base image in this test')
def test_set_time(self):
- self.conf.set_override('install_type', 'source')
kolla = build.KollaWorker(self.conf)
kolla.setup_working_dir()
kolla.set_time()
@@ -543,7 +535,6 @@ 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)
@@ -569,7 +560,6 @@ 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)
@@ -588,7 +578,6 @@ 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)