diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 19:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 19:53:26 +0000 |
| commit | 98914c483ac5b377e04420bf8d314dee21453169 (patch) | |
| tree | 589f9dd2f8b1242a9d97924d96e2efff54d6be39 | |
| parent | bf09e909d069b5ca69f2651eab83c1af2ac5cc6b (diff) | |
| parent | efa628d015fe0efcf7c692af7d593eac0ff87ef6 (diff) | |
| download | kolla-98914c483ac5b377e04420bf8d314dee21453169.tar.gz kolla-98914c483ac5b377e04420bf8d314dee21453169.zip | |
Merge "Py3 and py2 implementation for kolla/image module"
| -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']) |