diff options
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 42 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 10 |
3 files changed, 3 insertions, 51 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 3a5fd5409..5bd8514d0 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -40,7 +40,7 @@ DELOREAN = "https://trunk.rdoproject.org/centos8-yoga/" \ DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-yoga/" \ "delorean-deps.repo" -INSTALL_TYPE_CHOICES = ['binary', 'source'] +INSTALL_TYPE_CHOICES = ['source'] # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source diff --git a/kolla/image/build.py b/kolla/image/build.py index 583c22f18..bf5fbb191 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -86,19 +86,6 @@ UNBUILDABLE_IMAGES = { "skydive-base", # no aarch64 binary }, - 'binary': { - "bifrost-base", - "blazar-base", - "cyborg-base", - "freezer-base", - "kuryr-base", - "monasca-base", - "monasca-thresh", - "solum-base", - "venus-base", - "zun-base", - }, - 'source': { "watcher-base", # https://bugs.launchpad.net/watcher/+bug/1952944 }, @@ -132,23 +119,6 @@ UNBUILDABLE_IMAGES = { # than distribution has "telegraf", # no binary package }, - - "centos+binary": { - "masakari-base", - }, - - 'debian+binary': { - "nova-serialproxy", # no binary package - "tacker-base", # no binary package - }, - - 'ubuntu+binary': { - "senlin-conductor", # no binary package - "senlin-health-manager", # no binary package - "tacker-base", - "vitrage-base", - "neutron-mlnx-agent", - }, } # NOTE(hrw): all non-infra images and their children @@ -683,18 +653,6 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache - if (self.install_type == 'binary' and self.base == 'debian' and - self.base_arch != 'x86_64'): - LOG.info("Debian/binary target is available only for x86-64 " - "due to lack of packages for other architectures.") - sys.exit(1) - - if self.install_type == 'binary': - LOG.info("Building binary images is now deprecated. Consider " - "switching to source ones.") - LOG.info("Build will continue in 5 seconds.") - time.sleep(5) - self.image_prefix = self.base + '-' + self.install_type + '-' if self.conf.infra_rename: self.infra_image_prefix = self.base + '-infra-' diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 6174d5dd8..0dac5ecb6 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -11,7 +11,6 @@ # limitations under the License. import fixtures -import itertools import os import requests import sys @@ -365,16 +364,11 @@ class KollaWorkerTest(base.TestCase): self.addCleanup(patcher.stop) self.mock_client = patcher.start() - def test_supported_base_type(self): + def test_supported_base_distro(self): build_base = ['centos', 'debian', 'ubuntu'] - build_type = ['source', 'binary'] - for base_distro, install_type in itertools.chain( - itertools.product(build_base, build_type)): + for base_distro in build_base: 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) |