Merge "Add start time (in seconds) to the WSGI configuration file"
diff --git a/.zuul.yaml b/.zuul.yaml
index 3632dc0..2fbfa04 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -441,7 +441,7 @@
description: |
Minimal devstack base job, intended for use by jobs that need
less than the normal minimum set of required-projects.
- nodeset: openstack-single-node-jammy
+ nodeset: openstack-single-node-noble
required-projects:
- opendev.org/openstack/requirements
vars:
@@ -688,7 +688,7 @@
- job:
name: devstack-multinode
parent: devstack
- nodeset: openstack-two-node-jammy
+ nodeset: openstack-two-node-noble
description: |
Simple multinode test to verify multinode functionality on devstack side.
This is not meant to be used as a parent job.
@@ -729,18 +729,18 @@
configure_swap_size: 4096
- job:
- name: devstack-platform-ubuntu-noble
+ name: devstack-platform-ubuntu-jammy
parent: tempest-full-py3
- description: Ubuntu 24.04 LTS (noble) platform test
- nodeset: openstack-single-node-noble
+ description: Ubuntu 22.04 LTS (Jammy) platform test
+ nodeset: openstack-single-node-jammy
timeout: 9000
vars:
configure_swap_size: 8192
- job:
- name: devstack-platform-ubuntu-jammy-ovn-source
- parent: devstack-platform-ubuntu-jammy
- description: Ubuntu 22.04 LTS (jammy) platform test (OVN from source)
+ name: devstack-platform-ubuntu-noble-ovn-source
+ parent: devstack-platform-ubuntu-noble
+ description: Ubuntu 24.04 LTS (noble) platform test (OVN from source)
voting: false
vars:
devstack_localrc:
@@ -750,10 +750,10 @@
OVS_SYSCONFDIR: "/usr/local/etc/openvswitch"
- job:
- name: devstack-platform-ubuntu-jammy-ovs
+ name: devstack-platform-ubuntu-noble-ovs
parent: tempest-full-py3
- description: Ubuntu 22.04 LTS (jammy) platform test (OVS)
- nodeset: openstack-single-node-jammy
+ description: Ubuntu 24.04 LTS (noble) platform test (OVS)
+ nodeset: openstack-single-node-noble
voting: false
timeout: 9000
vars:
@@ -855,7 +855,7 @@
- job:
name: devstack-unit-tests
- nodeset: ubuntu-jammy
+ nodeset: ubuntu-noble
description: |
Runs unit tests on devstack project.
@@ -875,9 +875,9 @@
- devstack-platform-centos-9-stream
- devstack-platform-debian-bookworm
- devstack-platform-rocky-blue-onyx
- - devstack-platform-ubuntu-jammy-ovn-source
- - devstack-platform-ubuntu-jammy-ovs
- - devstack-platform-ubuntu-noble
+ - devstack-platform-ubuntu-noble-ovn-source
+ - devstack-platform-ubuntu-noble-ovs
+ - devstack-platform-ubuntu-jammy
- devstack-multinode
- devstack-unit-tests
- openstack-tox-bashate
@@ -992,6 +992,6 @@
- devstack-platform-centos-9-stream
- devstack-platform-debian-bookworm
- devstack-platform-rocky-blue-onyx
- - devstack-platform-ubuntu-jammy-ovn-source
- - devstack-platform-ubuntu-jammy-ovs
- - devstack-platform-ubuntu-noble
+ - devstack-platform-ubuntu-noble-ovn-source
+ - devstack-platform-ubuntu-noble-ovs
+ - devstack-platform-ubuntu-jammy
diff --git a/inc/python b/inc/python
index c94e5a4..bd58905 100644
--- a/inc/python
+++ b/inc/python
@@ -40,11 +40,8 @@
# Using system site packages to enable nova to use libguestfs.
# This package is currently installed via the distro and not
# available on pypi.
- python$PYTHON3_VERSION -m venv --system-site-packages $DEVSTACK_VENV
- pip_install -U pip setuptools
- #NOTE(rpittau): workaround for simplejson removal in osc
- # https://review.opendev.org/c/openstack/python-openstackclient/+/920001
- pip_install -U simplejson
+ $PYTHON -m venv --system-site-packages "${DEVSTACK_VENV}"
+ pip_install -U pip setuptools[core]
fi
if [[ ":$PATH:" != *":$DEVSTACK_VENV/bin:"* ]] ; then
export PATH="$DEVSTACK_VENV/bin:$PATH"
diff --git a/lib/databases/mysql b/lib/databases/mysql
index e069e12..629014c 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -104,10 +104,10 @@
# Set the root password - only works the first time. For Ubuntu, we already
# did that with debconf before installing the package, but we still try,
# because the package might have been installed already. We don't do this
- # for Ubuntu 22.04 (jammy) because the authorization model change in
+ # 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" == "jammy" ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then
+ if ! (is_ubuntu && [[ ! "$DISTRO" =~ bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then
sudo mysqladmin -u root password $DATABASE_PASSWORD || true
fi
@@ -124,16 +124,11 @@
# we need to change auth plugin for root user
# 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/
- sudo mysql -e "ALTER USER $DATABASE_USER@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD('$DATABASE_PASSWORD');"
- else
- sudo mysql $cmd_args -e "UPDATE mysql.user SET plugin='' WHERE user='$DATABASE_USER' AND host='localhost';"
- sudo mysql $cmd_args -e "FLUSH PRIVILEGES;"
- fi
+ # For Ubuntu 22.04+ we follow the model outlined in
+ # https://mariadb.org/authentication-in-mariadb-10-4/
+ sudo mysql -e "ALTER USER $DATABASE_USER@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD('$DATABASE_PASSWORD');"
fi
- if ! (is_ubuntu && [[ "$DISTRO" == "jammy" ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then
+ if ! (is_ubuntu && [[ ! "$DISTRO" =~ bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]); then
# Create DB user if it does not already exist
sudo mysql $cmd_args -e "CREATE USER IF NOT EXISTS '$DATABASE_USER'@'%' identified by '$DATABASE_PASSWORD';"
# Update the DB to give user '$DATABASE_USER'@'%' full control of the all databases:
diff --git a/lib/infra b/lib/infra
index 2aad003..f4760c3 100644
--- a/lib/infra
+++ b/lib/infra
@@ -31,7 +31,7 @@
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
[ ! -d $PIP_VIRTUAL_ENV ] && ${VIRTUALENV_CMD} $PIP_VIRTUAL_ENV
# We don't care about testing git pbr in the requirements venv.
- PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools
+ PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools[core]
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
# Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped