openstack/devstack
Code Issues Proposed changes

Merge "Adding devstack support for Rocky Linux 9"

Browse Source
This commit is contained in:
Zuul 2022-10-14 09:53:29 +00:00 committed by Gerrit Code Review
commit 6c8e88f61d
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.zuul.yaml
View File

@ -98,6 +98,16 @@
nodes: nodes:
- controller - controller
- nodeset:
name: devstack-single-node-rockylinux-9
nodes:
- name: controller
label: rockylinux-9
groups:
- name: tempest
nodes:
- controller
- nodeset: - nodeset:
name: openstack-two-node name: openstack-two-node
nodes: nodes:
@ -667,6 +677,15 @@
vars: vars:
configure_swap_size: 4096 configure_swap_size: 4096
- job:
name: devstack-platform-rocky-blue-onyx
parent: tempest-full-py3
description: Rocky Linux 9 Blue Onyx platform test
nodeset: devstack-single-node-rockylinux-9
timeout: 9000
vars:
configure_swap_size: 4096
- job: - job:
name: devstack-platform-ubuntu-jammy name: devstack-platform-ubuntu-jammy
parent: tempest-full-py3 parent: tempest-full-py3
@ -834,6 +853,7 @@
- devstack-platform-fedora-latest - devstack-platform-fedora-latest
- devstack-platform-centos-9-stream - devstack-platform-centos-9-stream
- devstack-platform-debian-bullseye - devstack-platform-debian-bullseye
- devstack-platform-rocky-blue-onyx
- devstack-platform-ubuntu-jammy - devstack-platform-ubuntu-jammy
- devstack-platform-ubuntu-jammy-ovn-source - devstack-platform-ubuntu-jammy-ovn-source
- devstack-platform-ubuntu-jammy-ovs - devstack-platform-ubuntu-jammy-ovs

2
doc/source/index.rst
View File

@ -38,7 +38,7 @@ Install Linux
Start with a clean and minimal install of a Linux system. DevStack Start with a clean and minimal install of a Linux system. DevStack
attempts to support the two latest LTS releases of Ubuntu, the attempts to support the two latest LTS releases of Ubuntu, the
latest/current Fedora version, CentOS/RHEL 8 and OpenSUSE. latest/current Fedora version, CentOS/RHEL/Rocky Linux 9 and OpenSUSE.
If you do not have a preference, Ubuntu 20.04 (Focal Fossa) is the If you do not have a preference, Ubuntu 20.04 (Focal Fossa) is the
most tested, and will probably go the smoothest. most tested, and will probably go the smoothest.

7
functions-common
View File

@ -418,6 +418,9 @@ function GetOSVersion {
os_RELEASE=${VERSION_ID} os_RELEASE=${VERSION_ID}
os_CODENAME="n/a" os_CODENAME="n/a"
os_VENDOR=$(echo $NAME | tr -d '[:space:]') os_VENDOR=$(echo $NAME | tr -d '[:space:]')
elif [[ "${ID}${VERSION}" =~ "rocky9" ]]; then
os_VENDOR="Rocky"
os_RELEASE=${VERSION_ID}
else else
_ensure_lsb_release _ensure_lsb_release
@ -466,6 +469,7 @@ function GetDistro {
"$os_VENDOR" =~ (AlmaLinux) || \ "$os_VENDOR" =~ (AlmaLinux) || \
"$os_VENDOR" =~ (Scientific) || \ "$os_VENDOR" =~ (Scientific) || \
"$os_VENDOR" =~ (OracleServer) || \ "$os_VENDOR" =~ (OracleServer) || \
"$os_VENDOR" =~ (Rocky) || \
"$os_VENDOR" =~ (Virtuozzo) ]]; then "$os_VENDOR" =~ (Virtuozzo) ]]; then
# Drop the . release as we assume it's compatible # Drop the . release as we assume it's compatible
# XXX re-evaluate when we get RHEL10 # XXX re-evaluate when we get RHEL10
@ -513,7 +517,7 @@ function is_oraclelinux {
# Determine if current distribution is a Fedora-based distribution # Determine if current distribution is a Fedora-based distribution
# (Fedora, RHEL, CentOS, etc). # (Fedora, RHEL, CentOS, Rocky, etc).
# is_fedora # is_fedora
function is_fedora { function is_fedora {
if [[ -z "$os_VENDOR" ]]; then if [[ -z "$os_VENDOR" ]]; then
@ -523,6 +527,7 @@ function is_fedora {
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \ [ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "RedHatEnterprise" ] || \ [ "$os_VENDOR" = "RedHatEnterprise" ] || \
[ "$os_VENDOR" = "Rocky" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
[ "$os_VENDOR" = "AlmaLinux" ] || \ [ "$os_VENDOR" = "AlmaLinux" ] || \
[ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ] [ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]