diff options
| -rw-r--r-- | .zuul.d/centos.yaml | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 8 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 2 | ||||
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 1554e5f0a..7842dbed8 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 12920586e..2a5dcd2c2 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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', } diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 6ccd38f99..cd2f5ca8c 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -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 }}" diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 72fa5d7ff..cba3c16a9 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -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 }} |