From 3176576e13514a192c027bca1c80c62f57706bec Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 3 Dec 2024 17:10:29 -0500 Subject: [PATCH] add RHEL 9.5 and Rocky 9.5 support --- scripts/common/preflights.sh | 4 ++-- testgrid/specs/os-firstlast.yaml | 4 ++-- testgrid/specs/os-full.yaml | 6 ------ testgrid/specs/os-latest.yaml | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/common/preflights.sh b/scripts/common/preflights.sh index b69ceb8b57..d5bcb136c9 100644 --- a/scripts/common/preflights.sh +++ b/scripts/common/preflights.sh @@ -88,9 +88,9 @@ function bailIfUnsupportedOS() { ;; ubuntu18.04|ubuntu20.04|ubuntu22.04|ubuntu24.04) ;; - rhel8.0|rhel8.1|rhel8.2|rhel8.3|rhel8.4|rhel8.5|rhel8.6|rhel8.7|rhel8.8|rhel8.9|rhel8.10|rhel9.0|rhel9.1|rhel9.2|rhel9.3|rhel9.4|rhel9) + rhel8.0|rhel8.1|rhel8.2|rhel8.3|rhel8.4|rhel8.5|rhel8.6|rhel8.7|rhel8.8|rhel8.9|rhel8.10|rhel9.0|rhel9.1|rhel9.2|rhel9.3|rhel9.4|rhel9.5|rhel9) ;; - rocky9.0|rocky9.1|rocky9.2|rocky9.3|rocky9.4|rocky9) + rocky9.0|rocky9.1|rocky9.2|rocky9.3|rocky9.4|rocky9.5|rocky9) ;; centos8|centos8.0|centos8.1|centos8.2|centos8.3|centos8.4|centos9) ;; diff --git a/testgrid/specs/os-firstlast.yaml b/testgrid/specs/os-firstlast.yaml index 7c9a694215..e89eaa4758 100644 --- a/testgrid/specs/os-firstlast.yaml +++ b/testgrid/specs/os-firstlast.yaml @@ -31,8 +31,8 @@ bash centos2ol.sh -r - id: rocky-9 name: Rocky Linux - version: "9.4" - vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 + version: "9.5" + vmimageuri: https://download.rockylinux.org/pub/rocky/9.5/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 preinit: | yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl - id: centos-9 diff --git a/testgrid/specs/os-full.yaml b/testgrid/specs/os-full.yaml index 5173d736c9..fa7e80ec88 100644 --- a/testgrid/specs/os-full.yaml +++ b/testgrid/specs/os-full.yaml @@ -40,12 +40,6 @@ vmimageuri: https://dl.rockylinux.org/vault/rocky/9.1/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 preinit: | yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl -- id: rocky-94 - name: Rocky Linux - version: "9.4" - vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 - preinit: | - yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl- id: rocky-9 - name: Rocky Linux version: "9.5" vmimageuri: https://download.rockylinux.org/pub/rocky/9.5/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 diff --git a/testgrid/specs/os-latest.yaml b/testgrid/specs/os-latest.yaml index 8fee3cb3c9..e41af5400e 100644 --- a/testgrid/specs/os-latest.yaml +++ b/testgrid/specs/os-latest.yaml @@ -26,8 +26,8 @@ bash centos2ol.sh -r - id: rocky-9 name: Rocky Linux - version: "9.4" - vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 + version: "9.5" + vmimageuri: https://download.rockylinux.org/pub/rocky/9.5/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2 preinit: | yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl - id: centos-9