add support for rhel 9.3, test with rhel 9.3, add 9.1 image test (#4985)

replicatedhq · Dec 13, 2023 · d3dc0fb · d3dc0fb
1 parent 070d0b3
commit d3dc0fb
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 68 deletions.
diff --git a/addons/containerd/template/testgrid/k8s-ctrd.yaml b/addons/containerd/template/testgrid/k8s-ctrd.yaml
@@ -147,7 +147,8 @@
     validate_testfile rwtest testfile.txt
     validate_read_write_object_store postupgrade upgradefile.txt
   unsupportedOSIDs:
-  - rocky-92 # docker is not supported on rhel 9 variants
+  - rocky-91 # docker is not supported on rhel 9 variants
+  - rocky-9 # docker is not supported on rhel 9 variants
 - name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
   flags: "yes"
   installerSpec:
@@ -208,7 +209,8 @@
     validate_testfile rwtest testfile.txt
     validate_read_write_object_store postupgrade upgradefile.txt
   unsupportedOSIDs:
-  - rocky-92 # docker is not supported on rhel 9 variants
+  - rocky-91 # docker is not supported on rhel 9 variants
+  - rocky-9 # docker is not supported on rhel 9 variants
 
 - name: Upgrade Containerd from 1.4.x to __testver__
   installerSpec:
@@ -265,7 +267,8 @@
   - centos-79
   - ol-79
   - ubuntu-2204
-  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
+  - rocky-91 # containerd < 1.6 is not supported on rhel 9 variants
+  - rocky-9 # containerd < 1.6 is not supported on rhel 9 variants
 
 - name: Upgrade Containerd from 1.5.x to __testver__
   installerSpec:
@@ -306,7 +309,8 @@
   postUpgradeScript: |
     containerd --version | grep "__testver__"
   unsupportedOSIDs:
-  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
+  - rocky-91 # containerd < 1.6 is not supported on rhel 9 variants
+  - rocky-9 # containerd < 1.6 is not supported on rhel 9 variants
 
 - name: "Upgrade Containerd from current to __testver__"
   installerSpec:

diff --git a/addons/flannel/template/testgrid/k8s-ctrd.yaml b/addons/flannel/template/testgrid/k8s-ctrd.yaml
@@ -213,7 +213,8 @@
       version: "__testver__"
       s3Override: "__testdist__"
   unsupportedOSIDs:
-  - rocky-92 # docker is not supported on rhel 9 variants
+  - rocky-91 # docker is not supported on rhel 9 variants
+  - rocky-9 # docker is not supported on rhel 9 variants
   - centos-81 # docker 20.10.17 is not supported on centos 8.1.
   - centos-84 # docker 20.10.17 is not supported on centos 8.4.
   - ol-8x # docker 20.10.17 is not supported on ol 8.7.
diff --git a/scripts/common/preflights.sh b/scripts/common/preflights.sh
@@ -84,9 +84,9 @@ function bailIfUnsupportedOS() {
             ;;
         ubuntu18.04|ubuntu20.04|ubuntu22.04)
             ;;
-        rhel7.4|rhel7.5|rhel7.6|rhel7.7|rhel7.8|rhel7.9|rhel8.0|rhel8.1|rhel8.2|rhel8.3|rhel8.4|rhel8.5|rhel8.6|rhel8.7|rhel8.8|rhel8.9|rhel9.0|rhel9.1|rhel9.2)
+        rhel7.4|rhel7.5|rhel7.6|rhel7.7|rhel7.8|rhel7.9|rhel8.0|rhel8.1|rhel8.2|rhel8.3|rhel8.4|rhel8.5|rhel8.6|rhel8.7|rhel8.8|rhel8.9|rhel9.0|rhel9.1|rhel9.2|rhel9.3)
             ;;
-        rocky9.0|rocky9.1|rocky9.2)
+        rocky9.0|rocky9.1|rocky9.2|rocky9.3)
             ;;
         centos7.4|centos7.5|centos7.6|centos7.7|centos7.8|centos7.9|centos8|centos8.0|centos8.1|centos8.2|centos8.3|centos8.4)
             ;;

diff --git a/testgrid/specs/customer-migration-specs.yaml b/testgrid/specs/customer-migration-specs.yaml
@@ -336,7 +336,8 @@
       version: 3.7.0-5.5.0
   unsupportedOSIDs:
     - ubuntu-2204 # this version of docker is too old for 22.04
-    - rocky-92
+    - rocky-91
+    - rocky-9
     - ol-8x
   postInstallScript: |
     # source helper functions
@@ -454,7 +455,8 @@
       version: 3.7.0-6.0.1
   unsupportedOSIDs:
     - ubuntu-2204 # this version of docker is too old for 22.04
-    - rocky-92
+    - rocky-91
+    - rocky-9
     - ol-8x
   postInstallScript: |
     # source helper functions
@@ -566,7 +568,8 @@
       version: 3.7.0-6.0.1
   unsupportedOSIDs:
     - ubuntu-2204 # this version of docker is too old for 22.04
-    - rocky-92
+    - rocky-91
+    - rocky-9
     - ol-8x
   postInstallScript: |
     # source helper functions
@@ -693,7 +696,8 @@
       version: 3.7.0-6.0.1
   unsupportedOSIDs:
     - ubuntu-2204 # this version of docker is too old for 22.04
-    - rocky-92
+    - rocky-91
+    - rocky-9
     - ol-8x
   postInstallScript: |
     # source helper functions
@@ -774,7 +778,8 @@
     certManager:
       version: "1.9.x"
   unsupportedOSIDs:
-    - rocky-92
+    - rocky-91
+    - rocky-9
     - ol-8x
   postInstallScript: |
     # source helper functions

diff --git a/testgrid/specs/deploy.yaml b/testgrid/specs/deploy.yaml
@@ -32,7 +32,8 @@
       version: latest
   unsupportedOSIDs:
     - centos-74 # Rook 1.8+ not supported on 3.10.0-693.el7.x86_64 kernel
-    - rocky-92 # docker is not supported on rhel 9 variants
+    - rocky-91 # docker is not supported on rhel 9 variants
+    - rocky-9 # docker is not supported on rhel 9 variants
 - name: "Upgrade to 1.25 to 1.28, Migrate from Rook 1.12.x to OpenEBS + Minio"
   flags: "yes"
   installerSpec: