Merge "Add AlmaLinux 10 platform job"

openstack/devstack

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2025年11月03日 20:42:54 +00:00

committed by Gerrit Code Review

parent 2801938292 b20eaa6e14

commit 55f4dab4c6

2 changed files with 29 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

33
.zuul.yaml

View File

@@ -39,10 +39,10 @@

- controller

- nodeset:

name:devstack-single-node-centos-10-stream

name:devstack-single-node-almalinux-10

nodes:

- name:controller

label:centos-10-stream-8GB

label:almalinux-10-8GB

groups:

- name:tempest

nodes:

@@ -58,10 +58,15 @@

nodes:

- controller

# TODO(frickler): drop this dummy nodeset once all references have been removed

- nodeset:

name:devstack-single-node-opensuse-15

nodes:[]

name:devstack-single-node-centos-10-stream

nodes:

- name:controller

label:centos-10-stream-8GB

groups:

- name:tempest

nodes:

- controller

- nodeset:

name:devstack-single-node-debian-bookworm

@@ -73,6 +78,11 @@

nodes:

- controller

# TODO(frickler): drop this dummy nodeset once all references have been removed

- nodeset:

name:devstack-single-node-opensuse-15

nodes:[]

- nodeset:

name:devstack-single-node-rockylinux-9

nodes:

@@ -766,6 +776,16 @@

# we often have to rush things through devstack to stabilise the gate,

# and these platforms don't have the round-the-clock support to avoid

# becoming blockers in that situation.

- job:

name:devstack-platform-almalinux-purple-lion

parent:tempest-full-py3

description:AlmaLinux 10 platform test

nodeset:devstack-single-node-almalinux-10

timeout:9000

voting:false

vars:

configure_swap_size:4096

- job:

name:devstack-platform-centos-10-stream

parent:tempest-full-py3

@@ -966,6 +986,7 @@

- devstack

- devstack-ipv6

- devstack-enforce-scope

- devstack-platform-almalinux-purple-lion

- devstack-platform-centos-10-stream

- devstack-platform-centos-9-stream

- devstack-platform-debian-bookworm

@@ -1051,10 +1072,12 @@

- devstack-no-tls-proxy

periodic-weekly:

jobs:

- devstack-platform-almalinux-purple-lion

- devstack-platform-centos-10-stream

- 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

2
functions-common

View File

@@ -438,7 +438,7 @@ 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}" =~ (centos|rocky|rhel) ]]; then

if [[ "${ID}" =~ (almalinux|centos|rocky|rhel) ]]; then

os_RELEASE=${VERSION_ID}

os_CODENAME=$(echo $VERSION | grep -oP '(?<=[(])[^)]*' || echo 'n/a')

os_VENDOR=$(echo $NAME | tr -d '[:space:]')