manifests: drop mentions of 9.4

We've moved on to 9.6 for OCP 4.19+ so there is no
need to keep the definitions around in our repo here.

README.md

@@ -13,8 +13,6 @@ To support building both a RHEL-based and a CentOS Stream-based CoreOS, the
 coreos-assembler concept of [variants] is used. The following variants are
 supported:
 
-- `rhel-9.4`: RHEL 9.4-based CoreOS; without OpenShift components.
-- `ocp-rhel-9.4`: RHEL 9.4-based CoreOS; including OpenShift components.
 - `rhel-9.6`: RHEL 9.6-based CoreOS; without OpenShift components.
 - `ocp-rhel-9.6`: RHEL 9.6-based CoreOS; including OpenShift components.
 - `c9s`: CentOS Stream-based CoreOS, without OKD components.
@@ -23,7 +21,7 @@ supported:
   by OpenShift are provided in CentOS Stream.
 
 In the future, the `ocp-*` variants will be removed. Instead, OpenShift
-components will be layered by deriving from the `rhel-9.4`/`c9s` images.
+components will be layered by deriving from the `rhel-9.X`/`c9s` images.
 
 The default variant is `ocp-rhel-9.6`.
 

ci/prow-entrypoint.sh

@@ -271,39 +271,33 @@ main() {
             prepare_repos
             ;;
         "build" | "init-and-build-default")  # TODO: change prow job to use init-and-build-default
-            cosa_init "ocp-rhel-9.4"
+            cosa_init "ocp-rhel-9.6"
             cosa_build
             ;;
         # this is called by cosa's CI
         "rhcos-cosa-prow-pr-ci")
             setup_user
-            cosa_init "ocp-rhel-9.4"
+            cosa_init "ocp-rhel-9.6"
             cosa_build
             kola_test_qemu
             ;;
         "rhcos-9-build-test-qemu")
             setup_user
-            cosa_init "ocp-rhel-9.4"
+            cosa_init "ocp-rhel-9.6"
             cosa_build
             kola_test_qemu
             ;;
         "rhcos-9-build-test-metal")
             setup_user
-            cosa_init "ocp-rhel-9.4"
+            cosa_init "ocp-rhel-9.6"
             cosa_build
             kola_test_metal
             ;;
-        "rhcos-96-build-test-qemu")
-            setup_user
-            cosa_init "ocp-rhel-9.6"
-            cosa_build
-            kola_test_qemu
+        "rhcos-9next-build-test-qemu")
+            exit 0
             ;;
-        "rhcos-96-build-test-metal")
-            setup_user
-            cosa_init "ocp-rhel-9.6"
-            cosa_build
-            kola_test_metal
+        "rhcos-9next-build-test-metal")
+            exit 0
             ;;
         "scos-9-build-test-qemu")
             setup_user

common.yaml

@@ -33,15 +33,11 @@ conditional-include:
     include: fedora-coreos-config/manifests/grub2-removals.yaml
   - if: osversion == "c9s"
     include: manifest-el9-shared.yaml
-  - if: osversion == "rhel-9.4"
-    include: manifest-el9-shared.yaml
   - if: osversion == "rhel-9.6"
     include: manifest-el9-shared.yaml
   # Packages specific to el9
   - if: osversion == "c9s"
     include: fedora-coreos-config/manifests/shared-el9.yaml
-  - if: osversion == "rhel-9.4"
-    include: fedora-coreos-config/manifests/shared-el9.yaml
   - if: osversion == "rhel-9.6"
     include: fedora-coreos-config/manifests/shared-el9.yaml
   - if: inherit_tier_x == true

image-c9s.yaml

@@ -1 +1 @@
-image-rhel-9.4.yaml
+image-rhel-9.6.yaml

image-rhel-9.6.yaml

@@ -0,0 +1,30 @@
+# See https://github.com/coreos/coreos-assembler/pull/298
+size: 16
+
+# We default to a container image
+deploy-via-container: true
+
+# Disable networking by default on firstboot. We can drop this once cosa stops
+# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
+ignition-network-kcmdline: []
+
+# add the requisite OCP metadata to our container image
+# but xref https://github.com/openshift/os/issues/1047
+ostree-container-inject-openshift-cvo-labels: true
+
+# vmware-secure-boot changes the EFI secure boot option.
+# set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055
+vmware-secure-boot: false
+
+# rhel9_64Guest requires hardware version 18 and vSphere 7.0U3
+# https://kb.vmware.com/s/article/88157
+vmware-os-type: rhel8_64Guest
+# VMware hardware versions: https://kb.vmware.com/s/article/1003746
+# Supported VMware versions: https://lifecycle.vmware.com/
+vmware-hw-version: 15
+
+# see https://github.com/coreos/coreos-assembler/pull/3607
+# Defaults for AWS
+aws-imdsv2-only: false
+aws-volume-type: "gp2"
+aws-x86-boot-mode: "legacy-bios"