Merge "Add Rocky Linux Red Quartz singlenode job (10)"
This commit is contained in:
21
.zuul.yaml
21
.zuul.yaml
@@ -83,6 +83,16 @@
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: devstack-single-node-rockylinux-10
|
||||
nodes:
|
||||
- name: controller
|
||||
label: rockylinux-10-8GB
|
||||
groups:
|
||||
- name: tempest
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: openstack-two-node-centos-10-stream
|
||||
nodes:
|
||||
@@ -802,6 +812,16 @@
|
||||
# TODO(ykarel) Remove this when moving to rocky10
|
||||
PYTHON3_VERSION: 3.11
|
||||
|
||||
- job:
|
||||
name: devstack-platform-rocky-red-quartz
|
||||
parent: tempest-full-py3
|
||||
description: Rocky Linux Red Quartz platform test
|
||||
nodeset: devstack-single-node-rockylinux-10
|
||||
timeout: 9000
|
||||
voting: false
|
||||
vars:
|
||||
configure_swap_size: 4096
|
||||
|
||||
- job:
|
||||
name: devstack-platform-ubuntu-jammy
|
||||
parent: tempest-full-py3
|
||||
@@ -950,6 +970,7 @@
|
||||
- devstack-platform-centos-9-stream
|
||||
- devstack-platform-debian-bookworm
|
||||
- devstack-platform-rocky-blue-onyx
|
||||
- devstack-platform-rocky-red-quartz
|
||||
- devstack-platform-ubuntu-noble-ovn-source
|
||||
- devstack-platform-ubuntu-noble-ovs
|
||||
- devstack-platform-ubuntu-jammy
|
||||
|
@@ -438,13 +438,10 @@ function _ensure_lsb_release {
|
||||
function GetOSVersion {
|
||||
# CentOS Stream 9 or later and RHEL 9 or later do not provide lsb_release
|
||||
source /etc/os-release
|
||||
if [[ "${ID}${VERSION}" =~ "centos" ]] || [[ "${ID}${VERSION}" =~ "rhel" ]]; then
|
||||
if [[ "${ID}" =~ (centos|rocky|rhel) ]]; then
|
||||
os_RELEASE=${VERSION_ID}
|
||||
os_CODENAME="n/a"
|
||||
os_CODENAME=$(echo $VERSION | grep -oP '(?<=[(])[^)]*')
|
||||
os_VENDOR=$(echo $NAME | tr -d '[:space:]')
|
||||
elif [[ "${ID}${VERSION}" =~ "rocky9" ]]; then
|
||||
os_VENDOR="Rocky"
|
||||
os_RELEASE=${VERSION_ID}
|
||||
else
|
||||
_ensure_lsb_release
|
||||
|
||||
@@ -483,7 +480,7 @@ function GetDistro {
|
||||
"$os_VENDOR" =~ (AlmaLinux) || \
|
||||
"$os_VENDOR" =~ (Scientific) || \
|
||||
"$os_VENDOR" =~ (OracleServer) || \
|
||||
"$os_VENDOR" =~ (Rocky) || \
|
||||
"$os_VENDOR" =~ (RockyLinux) || \
|
||||
"$os_VENDOR" =~ (Virtuozzo) ]]; then
|
||||
MAJOR_VERSION=$(echo $os_RELEASE | cut -d. -f1)
|
||||
DISTRO="rhel${MAJOR_VERSION}"
|
||||
@@ -544,7 +541,7 @@ function is_fedora {
|
||||
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterpriseLinux" ] || \
|
||||
[ "$os_VENDOR" = "Rocky" ] || \
|
||||
[ "$os_VENDOR" = "RockyLinux" ] || \
|
||||
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
|
||||
[ "$os_VENDOR" = "AlmaLinux" ] || \
|
||||
[ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]
|
||||
|
Reference in New Issue
Block a user