Merge "Adding devstack support for Rocky Linux 9"
This commit is contained in:
commit
6c8e88f61d
20
.zuul.yaml
20
.zuul.yaml
@ -98,6 +98,16 @@
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: devstack-single-node-rockylinux-9
|
||||
nodes:
|
||||
- name: controller
|
||||
label: rockylinux-9
|
||||
groups:
|
||||
- name: tempest
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: openstack-two-node
|
||||
nodes:
|
||||
@ -667,6 +677,15 @@
|
||||
vars:
|
||||
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:
|
||||
name: devstack-platform-ubuntu-jammy
|
||||
parent: tempest-full-py3
|
||||
@ -834,6 +853,7 @@
|
||||
- devstack-platform-fedora-latest
|
||||
- devstack-platform-centos-9-stream
|
||||
- devstack-platform-debian-bullseye
|
||||
- devstack-platform-rocky-blue-onyx
|
||||
- devstack-platform-ubuntu-jammy
|
||||
- devstack-platform-ubuntu-jammy-ovn-source
|
||||
- devstack-platform-ubuntu-jammy-ovs
|
||||
|
@ -38,7 +38,7 @@ Install Linux
|
||||
|
||||
Start with a clean and minimal install of a Linux system. DevStack
|
||||
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
|
||||
most tested, and will probably go the smoothest.
|
||||
|
@ -418,6 +418,9 @@ function GetOSVersion {
|
||||
os_RELEASE=${VERSION_ID}
|
||||
os_CODENAME="n/a"
|
||||
os_VENDOR=$(echo $NAME | tr -d '[:space:]')
|
||||
elif [[ "${ID}${VERSION}" =~ "rocky9" ]]; then
|
||||
os_VENDOR="Rocky"
|
||||
os_RELEASE=${VERSION_ID}
|
||||
else
|
||||
_ensure_lsb_release
|
||||
|
||||
@ -466,6 +469,7 @@ function GetDistro {
|
||||
"$os_VENDOR" =~ (AlmaLinux) || \
|
||||
"$os_VENDOR" =~ (Scientific) || \
|
||||
"$os_VENDOR" =~ (OracleServer) || \
|
||||
"$os_VENDOR" =~ (Rocky) || \
|
||||
"$os_VENDOR" =~ (Virtuozzo) ]]; then
|
||||
# Drop the . release as we assume it's compatible
|
||||
# XXX re-evaluate when we get RHEL10
|
||||
@ -513,7 +517,7 @@ function is_oraclelinux {
|
||||
|
||||
|
||||
# Determine if current distribution is a Fedora-based distribution
|
||||
# (Fedora, RHEL, CentOS, etc).
|
||||
# (Fedora, RHEL, CentOS, Rocky, etc).
|
||||
# is_fedora
|
||||
function is_fedora {
|
||||
if [[ -z "$os_VENDOR" ]]; then
|
||||
@ -523,6 +527,7 @@ function is_fedora {
|
||||
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
|
||||
[ "$os_VENDOR" = "Rocky" ] || \
|
||||
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
|
||||
[ "$os_VENDOR" = "AlmaLinux" ] || \
|
||||
[ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]
|
||||
|
Loading…
Reference in New Issue
Block a user