Support CentOS 8.3

Backport this until Train.

CentOS 8.3 renamed system repos. [1]
This caused failures when disabling and enabling.
More details in the referenced bug report.

Notice CentOS 8.2 and below will no longer work.

Train backport also includes some fixes for the
fallout from the new pip resolver.

* cap bandit<1.6.3, since bandit no longer supports
  Python 2.

* mark kuryr-libnetwork unbuildable for source
  images.

* mark almanach-base & dragonflow-base unbuildable
  for Debian & Ubuntu source images.

* Don't install networking-hyperv in source
  neutron-server images. pip complains of a conflict.
  (https://bugs.launchpad.net/kolla/+bug/1907826)

[1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes

Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff
Closes-Bug: #1907213
Closes-Bug: #1907826
Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Depends-On: https://review.opendev.org/766211
Depends-On: https://review.opendev.org/767157
This commit is contained in:
abraden 2020-12-07 19:20:44 +00:00 committed by Mark Goddard
parent 13e73e983b
commit 617421fb38
5 changed files with 41 additions and 6 deletions

View File

@ -244,8 +244,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
'dnf-plugins-core'
] %}
{% set base_centos_yum_repos_to_enable = [
'HighAvailability',
'PowerTools'
'ha',
'powertools'
] %}
# NOTE(yoctozepto): use upstream rabbitmq (3.7) and erlang on CentOS 8
# see https://launchpad.net/bugs/1884034

View File

@ -34,9 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %}
{% set neutron_server_pip_packages = [
'"networking-hyperv>=5.0.0,<6.0.0"'
] %}
{% set neutron_server_pip_packages = [] %}
{% set neutron_server_plugins_pip_packages = [
'/plugins/*'

View File

@ -104,6 +104,8 @@ UNBUILDABLE_IMAGES = {
},
'source': {
"kuryr-libnetwork", # Could not find a version that satisfies the
# requirement jsonschema>=2.6.0,<3.0.0
"tripleoclient",
},
'binary': {
@ -256,6 +258,20 @@ UNBUILDABLE_IMAGES = {
"vitrage-base",
"zaqar",
},
'debian+source': {
"almanach-base", # Could not find a version that satisfies the
# requirement Flask!=0.11,<1.0,>=0.10
"dragonflow-base", # Could not find a version that satisfies the
# requirement SQLAlchemy<1.1.0,>=1.0.10
},
'ubuntu+source': {
"almanach-base", # Could not find a version that satisfies the
# requirement Flask!=0.11,<1.0,>=0.10
"dragonflow-base", # Could not find a version that satisfies the
# requirement SQLAlchemy<1.1.0,>=1.0.10
},
}

View File

@ -0,0 +1,21 @@
---
fixes:
- |
Fixes builds on CentOS 8.3 failing due to renamed repos.
Notice Kolla now no longer supports CentOS 8.2 and below.
`LP#1907213 <https://launchpad.net/bugs/1907213>`__
upgrade:
- |
Kolla now no longer supports CentOS 8.2 and below.
This is to support CentOS 8.3 without extra workarounds (please
see the fixes section for more details).
The promise is to support the latest CentOS 8 release which is 8.3
now.
- |
Almanach and Dragonflow images are no longer available for
Debian/Ubuntu.
- |
The ``networking-hyperv`` package is no longer installed in the
``neutron-server`` source image.
- |
The ``kuryr-libnetwork`` image is no longer available.

View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
bandit!=1.6.0,!=1.6.3,>=1.1.0 # Apache-2.0
bandit!=1.6.0,<1.6.3,>=1.1.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
beautifulsoup4>=4.6.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0