Skip to content

Commit 358987f

Browse files
committed
Adding devstack support for Rocky Linux 9
Adding job and nodeset to run tempest-full-py3 in Rocky Linux 9 instance Change-Id: I6fb390bfeec436b50a3ddc18d154bbce3f3b1975
1 parent b5c2e7b commit 358987f

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
@@ -106,6 +106,16 @@
106106
nodes:
107107
- controller
108108

109+
- nodeset:
110+
name: devstack-single-node-rockylinux-9
111+
nodes:
112+
- name: controller
113+
label: rockylinux-9
114+
groups:
115+
- name: tempest
116+
nodes:
117+
- controller
118+
109119
- nodeset:
110120
name: openstack-two-node
111121
nodes:
@@ -676,6 +686,15 @@
676686
vars:
677687
configure_swap_size: 4096
678688

689+
- job:
690+
name: devstack-platform-rocky-blue-onyx
691+
parent: tempest-full-py3
692+
description: Rocky Linux 9 Blue Onyx platform test
693+
nodeset: devstack-single-node-rockylinux-9
694+
timeout: 9000
695+
vars:
696+
configure_swap_size: 4096
697+
679698
- job:
680699
name: devstack-platform-ubuntu-jammy
681700
parent: tempest-full-py3
@@ -852,6 +871,7 @@
852871
- devstack-platform-fedora-latest
853872
- devstack-platform-centos-9-stream
854873
- devstack-platform-debian-bullseye
874+
- devstack-platform-rocky-blue-onyx
855875
- devstack-platform-ubuntu-jammy
856876
- devstack-platform-ubuntu-jammy-ovn-source
857877
- 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)