Skip to content

Commit 6c8e88f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Adding devstack support for Rocky Linux 9"
2 parents dc8fc5c + 358987f commit 6c8e88f

3 files changed

Lines changed: 27 additions & 2 deletions

File tree

.zuul.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@
9898
nodes:
9999
- controller
100100

101+
- nodeset:
102+
name: devstack-single-node-rockylinux-9
103+
nodes:
104+
- name: controller
105+
label: rockylinux-9
106+
groups:
107+
- name: tempest
108+
nodes:
109+
- controller
110+
101111
- nodeset:
102112
name: openstack-two-node
103113
nodes:
@@ -667,6 +677,15 @@
667677
vars:
668678
configure_swap_size: 4096
669679

680+
- job:
681+
name: devstack-platform-rocky-blue-onyx
682+
parent: tempest-full-py3
683+
description: Rocky Linux 9 Blue Onyx platform test
684+
nodeset: devstack-single-node-rockylinux-9
685+
timeout: 9000
686+
vars:
687+
configure_swap_size: 4096
688+
670689
- job:
671690
name: devstack-platform-ubuntu-jammy
672691
parent: tempest-full-py3
@@ -834,6 +853,7 @@
834853
- devstack-platform-fedora-latest
835854
- devstack-platform-centos-9-stream
836855
- devstack-platform-debian-bullseye
856+
- devstack-platform-rocky-blue-onyx
837857
- devstack-platform-ubuntu-jammy
838858
- devstack-platform-ubuntu-jammy-ovn-source
839859
- devstack-platform-ubuntu-jammy-ovs

doc/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Install Linux
3838

3939
Start with a clean and minimal install of a Linux system. DevStack
4040
attempts to support the two latest LTS releases of Ubuntu, the
41-
latest/current Fedora version, CentOS/RHEL 8 and OpenSUSE.
41+
latest/current Fedora version, CentOS/RHEL/Rocky Linux 9 and OpenSUSE.
4242

4343
If you do not have a preference, Ubuntu 20.04 (Focal Fossa) is the
4444
most tested, and will probably go the smoothest.

functions-common

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ function GetOSVersion {
418418
os_RELEASE=${VERSION_ID}
419419
os_CODENAME="n/a"
420420
os_VENDOR=$(echo $NAME | tr -d '[:space:]')
421+
elif [[ "${ID}${VERSION}" =~ "rocky9" ]]; then
422+
os_VENDOR="Rocky"
423+
os_RELEASE=${VERSION_ID}
421424
else
422425
_ensure_lsb_release
423426

@@ -466,6 +469,7 @@ function GetDistro {
466469
"$os_VENDOR" =~ (AlmaLinux) || \
467470
"$os_VENDOR" =~ (Scientific) || \
468471
"$os_VENDOR" =~ (OracleServer) || \
472+
"$os_VENDOR" =~ (Rocky) || \
469473
"$os_VENDOR" =~ (Virtuozzo) ]]; then
470474
# Drop the . release as we assume it's compatible
471475
# XXX re-evaluate when we get RHEL10
@@ -513,7 +517,7 @@ function is_oraclelinux {
513517

514518

515519
# Determine if current distribution is a Fedora-based distribution
516-
# (Fedora, RHEL, CentOS, etc).
520+
# (Fedora, RHEL, CentOS, Rocky, etc).
517521
# is_fedora
518522
function is_fedora {
519523
if [[ -z "$os_VENDOR" ]]; then
@@ -523,6 +527,7 @@ function is_fedora {
523527
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
524528
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
525529
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
530+
[ "$os_VENDOR" = "Rocky" ] || \
526531
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
527532
[ "$os_VENDOR" = "AlmaLinux" ] || \
528533
[ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]

0 commit comments

Comments
 (0)