Merge pull request #4279 from replicatedhq/emosbaugh/sc-50954/disable…

…-rhel-9 chore: disable rhel 9 and variants
replicatedhq · Mar 27, 2023 · cf7fbb9 · cf7fbb9
2 parents bf0ff72 + 334d016
commit cf7fbb9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/scripts/common/preflights.sh b/scripts/common/preflights.sh
@@ -52,15 +52,13 @@ 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|rhel9.0|rhel9.1)
-            ;;
-        rocky9.0|rocky9.1)
+        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)
             ;;
         centos7.4|centos7.5|centos7.6|centos7.7|centos7.8|centos7.9|centos8|centos8.0|centos8.1|centos8.2|centos8.3|centos8.4)
             ;;
         amzn2)
             ;;
-        ol7.4|ol7.5|ol7.6|ol7.7|ol7.8|ol7.9|ol8.0|ol8.1|ol8.2|ol8.3|ol8.4|ol8.5|ol8.6|ol8.7|ol9.0|ol9.1)
+        ol7.4|ol7.5|ol7.6|ol7.7|ol7.8|ol7.9|ol8.0|ol8.1|ol8.2|ol8.3|ol8.4|ol8.5|ol8.6|ol8.7)
             ;;
         *)
             bail "Kubernetes install is not supported on ${LSB_DIST} ${DIST_VERSION}. The list of supported operating systems can be viewed at https://kurl.sh/docs/install-with-kurl/system-requirements."

diff --git a/testgrid/specs/os-firstlast.yaml b/testgrid/specs/os-firstlast.yaml
@@ -39,10 +39,10 @@
     curl -L -o centos2ol.sh https://raw.githubusercontent.com/oracle/centos2ol/main/centos2ol.sh
     chmod +x centos2ol.sh
     bash centos2ol.sh -r
-- id: rocky-91
-  name: Rocky Linux
-  version: "9.1"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
+# - id: rocky-91
+#   name: Rocky Linux
+#   version: "9.1"
+#   vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
 - id: ubuntu-1804
   name: Ubuntu
   version: "18.04"

diff --git a/testgrid/specs/os-full.yaml b/testgrid/specs/os-full.yaml
@@ -54,18 +54,18 @@
     curl -L -o centos2ol.sh https://raw.githubusercontent.com/oracle/centos2ol/main/centos2ol.sh
     chmod +x centos2ol.sh
     bash centos2ol.sh -r
-- id: rocky-91
-  name: Rocky Linux
-  version: "9.1"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
-- id: ol-9
-  name: Oracle Linux
-  version: "9.x"
-  vmimageuri: https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230227.0.x86_64.qcow2
-  preinit: |
-    curl -L -o centos2ol.sh https://raw.githubusercontent.com/oracle/centos2ol/main/centos2ol.sh
-    chmod +x centos2ol.sh
-    bash centos2ol.sh -r
+# - id: rocky-91
+#   name: Rocky Linux
+#   version: "9.1"
+#   vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
+# - id: ol-9
+#   name: Oracle Linux
+#   version: "9.x"
+#   vmimageuri: https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230227.0.x86_64.qcow2
+#   preinit: |
+#     curl -L -o centos2ol.sh https://raw.githubusercontent.com/oracle/centos2ol/main/centos2ol.sh
+#     chmod +x centos2ol.sh
+#     bash centos2ol.sh -r
 - id: ubuntu-1804
   name: Ubuntu
   version: "18.04"

diff --git a/testgrid/specs/os-latest.yaml b/testgrid/specs/os-latest.yaml
@@ -29,10 +29,10 @@
     curl -L -o centos2ol.sh https://raw.githubusercontent.com/oracle/centos2ol/main/centos2ol.sh
     chmod +x centos2ol.sh
     bash centos2ol.sh -r
-- id: rocky-91
-  name: Rocky Linux
-  version: "9.1"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
+# - id: rocky-91
+#   name: Rocky Linux
+#   version: "9.1"
+#   vmimageuri: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.1-20230215.0.x86_64.qcow2
 - id: ubuntu-2004
   name: Ubuntu
   version: "20.04"