CentOS 8: Switch default base image, tag as master

Changes the default base tag and distro for CentOS images from 7 to 8.

Also changes the tag used by the publisher jobs for CentOS 8 images from
'master-centos8' to 'master'.

Change-Id: I5498141ade23219d63f34debc2b8e1330dec2e68
Partially-Implements: blueprint centos-rhel-8
This commit is contained in:
Mark Goddard 2020-03-16 15:00:35 +00:00
parent e4bb18819f
commit 8294bac01b
4 changed files with 6 additions and 10 deletions

View File

@ -52,7 +52,6 @@
action: build
base_distro: centos
install_type: binary
base_tag: 8
- job:
name: kolla-publish-centos8-binary
@ -71,7 +70,6 @@
action: build
base_distro: centos
install_type: source
base_tag: 8
- job:
name: kolla-publish-centos8-source

View File

@ -23,14 +23,14 @@ from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian']
BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64']
DEFAULT_BASE_TAGS = {
'centos': '7',
'rhel': '7',
'centos': '8',
'rhel': '8',
'debian': '10',
'ubuntu': '18.04',
}
DISTRO_RELEASE = {
'centos': '7',
'rhel': '7',
'centos': '8',
'rhel': '8',
'debian': '10',
'ubuntu': '18.04',
}

View File

@ -33,6 +33,6 @@
dest: /etc/kolla/template_overrides.j2
- name: Run tox
command: tox -e {{ action }}-{{ base_distro }}{{ base_tag | default('') }}-{{ install_type }}
command: tox -e {{ action }}-{{ base_distro }}-{{ install_type }}
args:
chdir: "{{ zuul.project.src_dir }}"

View File

@ -2,9 +2,7 @@
debug = true
{% if publisher %}
namespace = kolla
{# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #}
{% set tag_suffix = '-centos8' if ansible_distribution | lower == 'centos' and base_tag | default == 8 else '' %}
tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) }}
{% endif %}
push = false
logs_dir = {{ kolla_build_logs_dir }}