Merge "GLOBAL_VENV: add nova to linked binaries"
diff --git a/.zuul.yaml b/.zuul.yaml
index 103d164..e65dc5b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -79,6 +79,16 @@
- controller
- nodeset:
+ name: devstack-single-node-debian-bookworm
+ nodes:
+ - name: controller
+ label: debian-bookworm
+ groups:
+ - name: tempest
+ nodes:
+ - controller
+
+- nodeset:
name: devstack-single-node-debian-bullseye
nodes:
- name: controller
@@ -703,6 +713,19 @@
GLOBAL_VENV: false
- job:
+ name: devstack-platform-debian-bookworm
+ parent: tempest-full-py3
+ description: Debian Bookworm platform test
+ nodeset: devstack-single-node-debian-bookworm
+ timeout: 9000
+ voting: false
+ vars:
+ configure_swap_size: 4096
+ devstack_localrc:
+ # TODO(frickler): drop this once wheel build is fixed
+ MYSQL_GATHER_PERFORMANCE: false
+
+- job:
name: devstack-platform-debian-bullseye
parent: tempest-full-py3
description: Debian Bullseye platform test
@@ -924,6 +947,7 @@
- devstack-ipv6
- devstack-enforce-scope
- devstack-platform-centos-9-stream
+ - devstack-platform-debian-bookworm
- devstack-platform-debian-bullseye
- devstack-platform-rocky-blue-onyx
- devstack-platform-ubuntu-focal
diff --git a/lib/databases/mysql b/lib/databases/mysql
index 27d1ec6..e069e12 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -20,7 +20,7 @@
MYSQL_SERVICE_NAME=mysql
if is_fedora && ! is_oraclelinux; then
MYSQL_SERVICE_NAME=mariadb
- elif [[ "$DISTRO" == "bullseye" ]]; then
+ elif [[ "$DISTRO" =~ bookworm|bullseye ]]; then
MYSQL_SERVICE_NAME=mariadb
fi
fi
@@ -122,7 +122,8 @@
# 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
- if is_ubuntu && [[ "$DISTRO" != "bullseye" ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
+ # TODO(frickler): simplify this logic
+ if is_ubuntu && [[ ! "$DISTRO" =~ bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
if [[ "$DISTRO" == "jammy" ]]; then
# For Ubuntu 22.04 (jammy) we follow the model outlined in
# https://mariadb.org/authentication-in-mariadb-10-4/
diff --git a/stack.sh b/stack.sh
index 641c3c3..94d586e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -230,7 +230,7 @@
# 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|jammy|rhel8|rhel9|openEuler-22.03"
+SUPPORTED_DISTROS="bookworm|bullseye|focal|jammy|rhel8|rhel9|openEuler-22.03"
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
echo "WARNING: this script has not been tested on $DISTRO"