diff --git a/dib-elements/infra-package-needs/post-install.d/80-enable-haveged b/dib-elements/infra-package-needs/post-install.d/80-enable-haveged index 621b92a..71d2797 100755 --- a/dib-elements/infra-package-needs/post-install.d/80-enable-haveged +++ b/dib-elements/infra-package-needs/post-install.d/80-enable-haveged @@ -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 diff --git a/dib-elements/infra-package-needs/post-install.d/80-enable-infra-services b/dib-elements/infra-package-needs/post-install.d/80-enable-infra-services index d74b65a..f88207f 100755 --- a/dib-elements/infra-package-needs/post-install.d/80-enable-infra-services +++ b/dib-elements/infra-package-needs/post-install.d/80-enable-infra-services @@ -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 diff --git a/dib-elements/nodepool-base/finalise.d/89-boot-settings b/dib-elements/nodepool-base/finalise.d/89-boot-settings index 0aa7469..b76d541 100755 --- a/dib-elements/nodepool-base/finalise.d/89-boot-settings +++ b/dib-elements/nodepool-base/finalise.d/89-boot-settings @@ -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 diff --git a/dib-elements/nodepool-base/install.d/20-iptables b/dib-elements/nodepool-base/install.d/20-iptables index ff60961..1e12669 100755 --- a/dib-elements/nodepool-base/install.d/20-iptables +++ b/dib-elements/nodepool-base/install.d/20-iptables @@ -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 diff --git a/dib-elements/nodepool-base/post-install.d/20-iptables b/dib-elements/nodepool-base/post-install.d/20-iptables index 7fd0de3..c0bad29 100755 --- a/dib-elements/nodepool-base/post-install.d/20-iptables +++ b/dib-elements/nodepool-base/post-install.d/20-iptables @@ -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 ;; diff --git a/zuul.d/image-build-jobs.yaml b/zuul.d/image-build-jobs.yaml index 5a6dcd3..476b892 100644 --- a/zuul.d/image-build-jobs.yaml +++ b/zuul.d/image-build-jobs.yaml @@ -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: | diff --git a/zuul.d/images.yaml b/zuul.d/images.yaml index 174ed5f..b498cc8 100644 --- a/zuul.d/images.yaml +++ b/zuul.d/images.yaml @@ -1,3 +1,11 @@ +- image: + name: almalinux-10 + type: zuul + +- image: + name: almalinux-10-arm64 + type: zuul + - image: name: centos-9-stream type: zuul diff --git a/zuul.d/labels.yaml b/zuul.d/labels.yaml index 1bd1d8e..2c965a9 100644 --- a/zuul.d/labels.yaml +++ b/zuul.d/labels.yaml @@ -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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 4ca7bdf..857b3f7 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -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 diff --git a/zuul.d/providers.yaml b/zuul.d/providers.yaml index 569e079..ef3c2ee 100644 --- a/zuul.d/providers.yaml +++ b/zuul.d/providers.yaml @@ -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