Merge "Add support for trixie and platform job"

openstack/devstack

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2025年11月11日 09:57:03 +00:00

committed by Gerrit Code Review

parent b0016635d5 f8ebb4939c

commit 1a059f699d

5 changed files with 65 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

51
.zuul.yaml

View File

@@ -68,6 +68,16 @@

nodes:

- controller

- nodeset:

name:devstack-single-node-debian-trixie

nodes:

- name:controller

label:debian-trixie-8GB

groups:

- name:tempest

nodes:

- controller

- nodeset:

name:devstack-single-node-debian-bookworm

nodes:

@@ -383,6 +393,36 @@

nodes:

- compute1

- nodeset:

name:devstack-two-node-debian-trixie

nodes:

- name:controller

label:debian-trixie-8GB

- name:compute1

label:debian-trixie-8GB

groups:

# Node where tests are executed and test results collected

- name:tempest

nodes:

- controller

# Nodes running the compute service

- name:compute

nodes:

- controller

- compute1

# Nodes that are not the controller

- name:subnode

nodes:

- compute1

# Switch node for multinode networking setup

- name:switch

nodes:

- controller

# Peer nodes for multinode networking setup

- name:peers

nodes:

- compute1

- job:

name:devstack-base

parent:openstack-multinode-fips

@@ -807,6 +847,15 @@

timeout:9000

voting:false

- job:

name:devstack-platform-debian-trixie

parent:tempest-full-py3

description:Debian Trixie platform test

nodeset:devstack-single-node-debian-trixie

timeout:9000

vars:

configure_swap_size:4096

- job:

name:devstack-platform-debian-bookworm

parent:tempest-full-py3

@@ -991,6 +1040,7 @@

- devstack-platform-centos-10-stream

- devstack-platform-centos-9-stream

- devstack-platform-debian-bookworm

- devstack-platform-debian-trixie

- devstack-platform-rocky-blue-onyx

- devstack-platform-rocky-red-quartz

- devstack-platform-ubuntu-noble-ovn-source

@@ -1022,6 +1072,7 @@

- devstack

- devstack-ipv6

- devstack-platform-debian-bookworm

- devstack-platform-debian-trixie

- devstack-platform-ubuntu-noble

# NOTE(danms): Disabled due to instability, see comment in the job

# definition above.

2
files/debs/general

View File

@@ -11,10 +11,8 @@ gettext # used for compiling message catalogs

git

graphviz # needed for docs

iputils-ping

libapache2-mod-proxy-uwsgi

libffi-dev # for pyOpenSSL

libjpeg-dev # Pillow 3.0.0

libpcre3-dev # for python-pcre

libpq-dev # psycopg2

libssl-dev # for pyOpenSSL

libsystemd-dev # for systemd-python

2
lib/apache

View File

@@ -82,7 +82,7 @@ function install_apache_uwsgi {

fi

if is_ubuntu; then

local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"

local pkg_list="uwsgi uwsgi-plugin-python3"

install_package ${pkg_list}

# NOTE(ianw) 2022年02月03日 : Fedora 35 needs to skip this and fall

# into the install-from-source because the upstream packages

14
lib/databases/mysql

View File

@@ -20,7 +20,7 @@ if [[ -z "$MYSQL_SERVICE_NAME" ]]; then

MYSQL_SERVICE_NAME=mysql

if is_fedora && ! is_oraclelinux; then

MYSQL_SERVICE_NAME=mariadb

elif [[ "$DISTRO" =~ bookworm|bullseye ]]; then

elif [[ "$DISTRO" =~ trixie|bookworm|bullseye ]]; then

MYSQL_SERVICE_NAME=mariadb

fi

@@ -107,7 +107,7 @@ function configure_database_mysql {

# for Ubuntu 22.04+ because the authorization model change in

# version 10.4 of mariadb. See

# https://mariadb.org/authentication-in-mariadb-10-4/

if ! (is_ubuntu && [[ ! "$DISTRO" =~ bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then

if ! (is_ubuntu && [[ ! "$DISTRO" =~ trixie|bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then

sudo mysqladmin -u root password $DATABASE_PASSWORD || true

fi

@@ -119,6 +119,16 @@ function configure_database_mysql {

local cmd_args="-uroot -p$DATABASE_PASSWORD -h$SERVICE_LOCAL_HOST "

fi

# Workaround for mariadb > 11.6.2,

# see https://bugs.launchpad.net/nova/+bug/2116186/comments/3

min_db_ver="11.6.2"

db_version=$(sudo mysql ${cmd_args} -e "select version();" -sN | cut -d '-' -f 1)

max_db_ver=$(printf '%s\n' ${min_db_ver} ${db_version} | sort -V | tail -n 1)

if [[ "${min_db_ver}" != "${max_db_ver}" ]]; then

iniset -sudo $my_conf mysqld innodb_snapshot_isolation OFF

restart_service $MYSQL_SERVICE_NAME

fi

# In mariadb e.g. on Ubuntu socket plugin is used for authentication

# as root so it works only as sudo. To restore old "mysql like" behaviour,

# we need to change auth plugin for root user

3
stack.sh

View File

@@ -1,6 +1,5 @@

#!/usr/bin/env bash

# ``stack.sh`` is an opinionated OpenStack developer installation. It

# installs and configures various combinations of **Cinder**, **Glance**,

# **Horizon**, **Keystone**, **Nova**, **Neutron**, and **Swift**

@@ -230,7 +229,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="bookworm|jammy|noble|rhel9|rhel10"

if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then

echo "WARNING: this script has not been tested on $DISTRO"