add RHEL 9.5 and Rocky 9.5 support (#5494)

replicatedhq · Dec 3, 2024 · 40272ad · 40272ad
1 parent 695684e
commit 40272ad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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