diff options
| -rwxr-xr-x | kolla/image/build.py | 3 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 8760b46cb..806cbbb12 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -497,7 +497,8 @@ class KollaWorker(object): self.install_type = conf.install_type self.tag = conf.tag self.images = list() - rpm_setup_config = filter(None, conf.rpm_setup_config) + rpm_setup_config = ([repo_file for repo_file in + conf.rpm_setup_config if repo_file is not None]) self.rpm_setup = self.build_rpm_setup(rpm_setup_config) rh_base = ['centos', 'oraclelinux', 'rhel'] diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index fccf7f41b..95b5fd2f1 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -230,6 +230,11 @@ class KollaWorkerTest(base.TestCase): self.assertEqual(2, len(self._get_matched_images(kolla.images))) + def test_build_rpm_setup(self): + """checking the length of list of docker commands""" + kolla = build.KollaWorker(self.conf) + self.assertEqual(2, len(kolla.rpm_setup)) + def test_pre_defined_exist_profile(self): # default profile include the fake image: image-base self.conf.set_override('profile', ['default']) |