From f775700a768a010141fa6c82ea94b2bb10a9fe7d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 9 Jan 2020 13:27:19 +0000 Subject: CentOS 8: Add zuul build and publish jobs Adds build and publishing jobs for CentOS 8 images: - kolla-build-centos8-binary - kolla-build-centos8-source - kolla-publish-centos8-binary - kolla-publish-centos8-source The 'base' image has been added to the list of unbuildable images for CentOS 8 (now separate from the list for CentOS 7). This means that no images will be built - the jobs should essentially be a 'noop'. Change-Id: Ie9a0109bd4eef337358d714e4b5088b8e3de2f23 Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit b060623b907348e518bdf1afede0b641be56c415) --- kolla/image/build.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'kolla') diff --git a/kolla/image/build.py b/kolla/image/build.py index 6d7824538..0bdcfb5e3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -143,6 +143,12 @@ UNBUILDABLE_IMAGES = { 'centos': { "ovsdpdk", }, + + # NOTE(mgoddard): Mark all images unbuildable for CentOS 8. + 'centos8': { + "base", + }, + 'debian': { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' @@ -1043,7 +1049,15 @@ class KollaWorker(object): filter_ += self.conf.profiles[profile] # mark unbuildable images and their children - tag_element = r'(%s|%s|%s)' % (self.base, + + # NOTE(mgoddard): Use a base of centos8 to allow a different set of + # unbuildable images for CentOS 8. + # TODO(mgoddard): Remove this after CentOS 8 transition. + base = self.base + if base == 'centos' and self.distro_package_manager == 'dnf': + base = 'centos8' + + tag_element = r'(%s|%s|%s)' % (base, self.install_type, self.base_arch) tag_re = re.compile(r'^%s(\+%s)*$' % (tag_element, tag_element)) -- cgit v1.2.3