Merge "Bump fedora-latest to F35"

This commit is contained in:
Zuul 2022-02-08 22:34:32 +00:00 committed by Gerrit Code Review
commit 7799e74a05
4 changed files with 13 additions and 4 deletions

View File

@ -90,7 +90,7 @@
name: devstack-single-node-fedora-latest
nodes:
- name: controller
label: fedora-34
label: fedora-35
groups:
- name: tempest
nodes:
@ -759,6 +759,10 @@
voting: false
vars:
configure_swap_size: 4096
# Python 3.10 dependency issues; see
# https://bugs.launchpad.net/horizon/+bug/1960204
devstack_services:
horizon: false
- job:
name: devstack-platform-fedora-latest-virt-preview

View File

@ -4,4 +4,4 @@ memcached
rsync-daemon
sqlite
xfsprogs
xinetd # not:f34,rhel9
xinetd # not:f35,rhel9

View File

@ -85,7 +85,12 @@ function install_apache_uwsgi {
if is_ubuntu; then
local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
install_package ${pkg_list}
elif is_fedora && ! is_openeuler; then
# NOTE(ianw) 2022-02-03 : Fedora 35 needs to skip this and fall
# into the install-from-source because the upstream packages
# didn't fix Python 3.10 compatibility before release. Should be
# fixed in uwsgi 4.9.0; can remove this when packages available
# or we drop this release
elif is_fedora && ! is_openeuler && ! [[ $DISTRO =~ f35 ]]; then
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
# default; the mod_proxy_uwsgi package actually conflicts now.
# See:

View File

@ -227,7 +227,7 @@ write_devstack_version
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack``
SUPPORTED_DISTROS="bullseye|focal|f34|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-20.03"
SUPPORTED_DISTROS="bullseye|focal|f35|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-20.03"
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
echo "WARNING: this script has not been tested on $DISTRO"