opendev/zuul-providers
Code Issues Proposed changes

Merge "Add Alma Linux 10 image build jobs"

Browse Source
This commit is contained in:
Zuul
2025-10-02 16:06:25 +00:00
committed by Gerrit Code Review
parent b97a08388d 41853e545f
commit bf4f41bf0c
10 changed files with 157 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dib-elements/infra-package-needs/post-install.d/80-enable-haveged
View File

@@ -6,7 +6,7 @@ fi
set -eu
set -o pipefail
if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ! ${DIB_RELEASE} =~ '8' ]]; then
if [[ "$DISTRO_NAME" =~ ^(almalinux|centos|rocky)$ && ! ${DIB_RELEASE} =~ '8' ]]; then
# For EL9 and newer we are just using the default rngd
exit 0
fi

2
dib-elements/infra-package-needs/post-install.d/80-enable-infra-services
View File

@@ -17,7 +17,7 @@ case "$DIB_INIT_SYSTEM" in
elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
# stick with default systemd timesyncd on bookworm, focal and beyond
exit 0
elif [[ $DISTRO_NAME == "centos" || $DISTRO_NAME == "fedora" || $DISTRO_NAME == "rocky" ]]; then
elif [[ "$DISTRO_NAME" =~ ^(almalinux|centos|fedora|rocky)$ ]]; then
systemctl enable chronyd
else
systemctl enable ntpd.service

2
dib-elements/nodepool-base/finalise.d/89-boot-settings
View File

@@ -76,7 +76,7 @@ server:
verbosity: 5"
echo "$UNBOUND_LOGGING_CONF" > /tmp/unbound-logging.conf
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|opensuse|openeuler|rocky) ]] ; then
if [[ "$DISTRO_NAME" =~ (almalinux|centos|rhel7|fedora|opensuse|openeuler|rocky) ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d
elif [[ "$DISTRO_NAME" =~ 'gentoo' ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d

2
dib-elements/nodepool-base/install.d/20-iptables
View File

@@ -24,7 +24,7 @@ if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
rules_dir=/etc/iptables
ipv4_rules=${rules_dir}/rules.v4
ipv6_rules=${rules_dir}/rules.v6
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
elif [[ "$DISTRO_NAME" =~ (almalinux|centos|rhel7|fedora|openeuler|rocky) ]] ; then
rules_dir=/etc/sysconfig
ipv4_rules=${rules_dir}/iptables
ipv6_rules=${rules_dir}/ip6tables

4
dib-elements/nodepool-base/post-install.d/20-iptables
View File

@@ -22,7 +22,7 @@ set -e
if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
service_name=netfilter-persistent
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
elif [[ "$DISTRO_NAME" =~ (almalinux|centos|rhel7|fedora|openeuler|rocky) ]] ; then
service_name=iptables
elif [[ "$DISTRO_NAME" == 'opensuse' ]] ; then
# handle iptables through init.d instead of a service
@@ -48,7 +48,7 @@ case "$DIB_INIT_SYSTEM" in
else
systemctl enable ${service_name}.service
fi
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
if [[ "$DISTRO_NAME" =~ (almalinux|centos|rhel7|fedora|openeuler|rocky) ]] ; then
systemctl enable ip6tables.service
fi
;;

45
zuul.d/image-build-jobs.yaml
View File

@@ -109,6 +109,51 @@
build_diskimage_environment:
DIB_EPEL_DISABLED: '1'
- job:
name: opendev-build-diskimage-almalinux-10
description: |
Build the OpenDev Alma Linux 10 VM image
parent: opendev-build-diskimage-base-el
image-build-name: almalinux-10
vars:
build_diskimage_image_name: almalinux-10
build_diskimage_elements:
- *base_elements
- almalinux-container
- epel
build_diskimage_environment:
DIB_CONTAINERFILE_BUILDOPTS: "--platform linux/amd64/v2"
DIB_RELEASE: '10'
- job:
name: opendev-promote-diskimage-almalinux-10
parent: opendev-promote-diskimage-base
image-build-name: almalinux-10
- job:
name: opendev-build-diskimage-almalinux-10-arm64
description: |
Build the OpenDev Alma Linux 10 arm64 VM image
parent: opendev-build-diskimage-base-el
nodeset:
nodes:
- name: ubuntu-noble-arm64
label: ubuntu-noble-arm64
image-build-name: almalinux-10-arm64
vars:
build_diskimage_image_name: almalinux-10-arm64
build_diskimage_elements:
- *base_elements
- almalinux-container
- epel
build_diskimage_environment:
DIB_RELEASE: '10'
- job:
name: opendev-promote-diskimage-almalinux-10-arm64
parent: opendev-promote-diskimage-base
image-build-name: almalinux-10-arm64
- job:
name: opendev-build-diskimage-centos-9-stream
description: |

8
zuul.d/images.yaml
View File

@@ -1,3 +1,11 @@
- image:
name: almalinux-10
type: zuul
- image:
name: almalinux-10-arm64
type: zuul
- image:
name: centos-9-stream
type: zuul

36
zuul.d/labels.yaml
View File

@@ -11,6 +11,42 @@
max-ready-age: 1800
# These are the new-style labels.
- label:
name: almalinux-10-4GB
image: almalinux-10
flavor: 4GB
max-ready-age: 1800
- label:
name: almalinux-10-8GB
image: almalinux-10
flavor: 8GB
max-ready-age: 1800
- label:
name: almalinux-10-16GB
image: almalinux-10
flavor: 16GB
max-ready-age: 1800
- label:
name: almalinux-10-arm64-8GB
image: almalinux-10-arm64
flavor: 8GB
max-ready-age: 1800
- label:
name: almalinux-10-arm64-16GB
image: almalinux-10-arm64
flavor: 16GB
max-ready-age: 1800
- label:
name: almalinux-10-nested-virt-8GB
image: almalinux-10
flavor: nested-virt-8GB
max-ready-age: 1800
- label:
name: centos-9-stream-4GB
image: centos-9-stream

34
zuul.d/project.yaml
View File

@@ -2,6 +2,8 @@
check:
jobs:
- noop
- opendev-build-diskimage-almalinux-10
- opendev-build-diskimage-almalinux-10-arm64
- opendev-build-diskimage-centos-9-stream
- opendev-build-diskimage-centos-9-stream-arm64
- opendev-build-diskimage-centos-10-stream
@@ -26,6 +28,16 @@
gate:
jobs:
- noop
- opendev-build-diskimage-almalinux-10:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-almalinux-10-arm64:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-centos-9-stream:
secrets:
- name: image_upload_secret
@@ -133,6 +145,16 @@
pass-to-parent: true
image-build:
jobs:
- opendev-build-diskimage-almalinux-10:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-almalinux-10-arm64:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-centos-9-stream:
secrets:
- name: image_upload_secret
@@ -240,6 +262,16 @@
pass-to-parent: true
periodic-image-build:
jobs:
- opendev-build-diskimage-almalinux-10:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-almalinux-10-arm64:
secrets:
- name: image_upload_secret
secret: image-upload-secret
pass-to-parent: true
- opendev-build-diskimage-centos-9-stream:
secrets:
- name: image_upload_secret
@@ -348,6 +380,8 @@
promote-image-build:
jobs:
- opendev-dispatch-promote-diskimage
- opendev-promote-diskimage-almalinux-10
- opendev-promote-diskimage-almalinux-10-arm64
- opendev-promote-diskimage-centos-9-stream
- opendev-promote-diskimage-centos-9-stream-arm64
- opendev-promote-diskimage-centos-10-stream

28
zuul.d/providers.yaml
View File

@@ -10,6 +10,7 @@
import-timeout: 21600 # 6 hours
launch-timeout: 600
images:
- almalinux-10
- centos-9-stream
- debian-bookworm
- debian-bullseye
@@ -21,6 +22,10 @@
- ubuntu-jammy
- ubuntu-noble
labels:
# Alma Linux 10
- almalinux-10-4GB
- almalinux-10-8GB
- almalinux-10-16GB
# CentOS 9 Stream
- centos-9-stream-4GB
- centos-9-stream-8GB
@@ -130,6 +135,7 @@
launch-timeout: 600
floating-ip-cleanup: true
images:
- almalinux-10
- centos-9-stream
- centos-10-stream
- debian-bookworm
@@ -143,6 +149,11 @@
- ubuntu-jammy
- ubuntu-noble
labels:
# Alma Linux 10
- almalinux-10-4GB
- almalinux-10-8GB
- almalinux-10-16GB
- almalinux-10-nested-virt-8GB
# CentOS 9 Stream
- centos-9-stream-4GB
- centos-9-stream-8GB
@@ -303,6 +314,7 @@
key-name: infra-root-keys-2024-04-08
launch-timeout: 300
images:
- almalinux-10
- centos-9-stream
- centos-10-stream
- debian-bookworm
@@ -316,6 +328,11 @@
- ubuntu-jammy
- ubuntu-noble
labels:
# Alma Linux 10
- almalinux-10-4GB
- almalinux-10-8GB
- almalinux-10-16GB
- almalinux-10-nested-virt-8GB
# CentOS 9 Stream
- centos-9-stream-4GB
- centos-9-stream-8GB
@@ -428,6 +445,7 @@
key-name: infra-root-keys-2024-04-08
launch-timeout: 900
images:
- almalinux-10
- centos-9-stream
- centos-10-stream
- debian-bookworm
@@ -441,6 +459,9 @@
- ubuntu-jammy
- ubuntu-noble
labels:
# Alma Linux 10
- almalinux-10-8GB
- almalinux-10-nested-virt-8GB
# CentOS 9 Stream
- centos-9-stream-8GB
- centos-9-stream
@@ -541,6 +562,7 @@
description: 8vcpu, 32GB ram, 160GB disk
flavor-name: v3-standard-8
images:
- almalinux-10
- centos-9-stream
- centos-10-stream
- debian-bookworm
@@ -565,6 +587,9 @@
name: vexxhost-ca-ymq-1-main
section: vexxhost-ca-ymq-1
labels:
# Alma Linux 10
- almalinux-10-16GB
- almalinux-10-nested-virt-8GB
# CentOS 9 Stream
- centos-9-stream-16GB
- centos-9-stream-nested-virt-8GB
@@ -630,6 +655,7 @@
description: 16vcpu, 16GB ram, 80GB disk
flavor-name: opendev.xxxlarge
images:
- almalinux-10-arm64
- centos-9-stream-arm64
- centos-10-stream-arm64
- debian-bookworm-arm64
@@ -651,6 +677,8 @@
name: osuosl-regionone-main
section: osuosl-regionone
labels:
- almalinux-10-arm64-8GB
- almalinux-10-arm64-16GB
- centos-9-stream-arm64-8GB
- centos-9-stream-arm64-16GB
- centos-9-stream-arm64