From cb74377c6b259e75515316f2e5ae0ca5f7d11fd7 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 10 Feb 2025 12:49:56 -0500 Subject: [PATCH] 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 | 4 +- ci/prow-entrypoint.sh | 22 +++----- common.yaml | 4 -- extensions-ocp-rhel-9.4.yaml | 89 ------------------------------ image-c9s.yaml | 2 +- image-ocp-rhel-9.4.yaml | 1 - image-rhel-9.4.yaml | 30 ----------- image-rhel-9.6.yaml | 31 ++++++++++- manifest-ocp-rhel-9.4.yaml | 101 ----------------------------------- manifest-rhel-9.4.yaml | 31 ----------- 10 files changed, 40 insertions(+), 275 deletions(-) delete mode 100644 extensions-ocp-rhel-9.4.yaml delete mode 120000 image-ocp-rhel-9.4.yaml delete mode 100644 image-rhel-9.4.yaml mode change 120000 => 100644 image-rhel-9.6.yaml delete mode 100644 manifest-ocp-rhel-9.4.yaml delete mode 100644 manifest-rhel-9.4.yaml diff --git a/README.md b/README.md index eca72a8da..425537e3a 100644 --- a/README.md +++ b/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`. diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 1917b1554..845ff1a2d 100755 --- a/ci/prow-entrypoint.sh +++ b/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 diff --git a/common.yaml b/common.yaml index a812616a3..29e8b9152 100644 --- a/common.yaml +++ b/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 diff --git a/extensions-ocp-rhel-9.4.yaml b/extensions-ocp-rhel-9.4.yaml deleted file mode 100644 index 2598aa620..000000000 --- a/extensions-ocp-rhel-9.4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -# RPMs as operating system extensions, distinct from the base ostree commit/image -# https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md -# and https://github.com/coreos/fedora-coreos-tracker/issues/401 - -extensions: - # https://issues.redhat.com/browse/RFE-4177 - wasm: - architectures: - - x86_64 - - aarch64 - repos: - - rhel-9.4-server-ose-4.19 - packages: - - crun-wasm - # https://github.com/coreos/fedora-coreos-tracker/issues/1504 - ipsec: - packages: - # pin to 4.6-3.el9_0.3 for now for https://issues.redhat.com/browse/OCPBUGS-43498 - # we can revert once that's fixed in latest libreswan - - libreswan-4.6-3.el9_0.3 - - NetworkManager-libreswan - # https://github.com/coreos/fedora-coreos-tracker/issues/326 - usbguard: - packages: - - usbguard - kerberos: - packages: - - krb5-workstation - - libkadm5 - # https://github.com/kmods-via-containers/kmods-via-containers/issues/3 - # https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 - # These are currently overlaid onto the host so that they can be bind-mounted - # into build containers... in the future they should be a `development` - # extension: https://github.com/openshift/machine-config-operator/pull/2143. - kernel-devel: - packages: - - kernel-devel - - kernel-headers - match-base-evr: kernel - # These are already in the base, so they're not OS extensions, but they're - # useful to have in RPM form to install in kmod build containers. - kernel: - kind: development - packages: - - kernel - - kernel-core - - kernel-modules - - kernel-modules-extra - match-base-evr: kernel - # GRPA-2822 - # https://github.com/openshift/machine-config-operator/pull/1330 - # https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md - kernel-rt: - architectures: - - x86_64 - repos: - - rhel-9.4-nfv - packages: - - kernel-rt-core - - kernel-rt-kvm - - kernel-rt-modules - - kernel-rt-modules-extra - - kernel-rt-devel - match-base-evr: kernel - # https://github.com/openshift/machine-config-operator/pull/2456 - # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md - # GRPA-3123 - # - kata-containers - sandboxed-containers: - architectures: - - x86_64 - - s390x - repos: - - rhel-9.4-server-ose-4.19 - packages: - - kata-containers - # https://issues.redhat.com/browse/COS-2402 - kernel-64k: - architectures: - - aarch64 - packages: - - kernel-64k-core - - kernel-64k-modules - - kernel-64k-modules-core - - kernel-64k-modules-extra - # https://issues.redhat.com/browse/COS-2940 - sysstat: - packages: - - sysstat diff --git a/image-c9s.yaml b/image-c9s.yaml index 3abbf78c5..14763a255 120000 --- a/image-c9s.yaml +++ b/image-c9s.yaml @@ -1 +1 @@ -image-rhel-9.4.yaml \ No newline at end of file +image-rhel-9.6.yaml \ No newline at end of file diff --git a/image-ocp-rhel-9.4.yaml b/image-ocp-rhel-9.4.yaml deleted file mode 120000 index 3abbf78c5..000000000 --- a/image-ocp-rhel-9.4.yaml +++ /dev/null @@ -1 +0,0 @@ -image-rhel-9.4.yaml \ No newline at end of file diff --git a/image-rhel-9.4.yaml b/image-rhel-9.4.yaml deleted file mode 100644 index 43122446b..000000000 --- a/image-rhel-9.4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# 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" diff --git a/image-rhel-9.6.yaml b/image-rhel-9.6.yaml deleted file mode 120000 index 3abbf78c5..000000000 --- a/image-rhel-9.6.yaml +++ /dev/null @@ -1 +0,0 @@ -image-rhel-9.4.yaml \ No newline at end of file diff --git a/image-rhel-9.6.yaml b/image-rhel-9.6.yaml new file mode 100644 index 000000000..43122446b --- /dev/null +++ b/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" diff --git a/manifest-ocp-rhel-9.4.yaml b/manifest-ocp-rhel-9.4.yaml deleted file mode 100644 index 08bf7f145..000000000 --- a/manifest-ocp-rhel-9.4.yaml +++ /dev/null @@ -1,101 +0,0 @@ -# Manifest for OCP node based on RHEL 9.4 -# Note: this manifest is temporary; in the future, OCP components will be layered instead. - -metadata: - license: MIT - name: rhcos - summary: OpenShift 4.19 - -variables: - osversion: "rhel-9.4" - -# Include manifests common to all RHEL and CentOS Stream versions and manifest -# common to RHEL 9 & C9S variants -include: - - manifest-rhel-9.4.yaml - - packages-openshift.yaml - -# Additional repos we need for OCP components -repos: - - rhel-9.4-fast-datapath - - rhel-9.4-server-ose-4.19 - -# We include hours/minutes to avoid version number reuse -automatic-version-prefix: "419.94." -# This ensures we're semver-compatible which OpenShift wants -automatic-version-suffix: "-" -# Keep this is sync with the version in postprocess -mutate-os-release: "4.19" - -postprocess: - - | - #!/usr/bin/env bash - set -xeo pipefail - - # Tweak /usr/lib/os-release - grep -v -e "OSTREE_VERSION" -e "OPENSHIFT_VERSION" /etc/os-release > /usr/lib/os-release.rhel - ( - . /etc/os-release - cat > /usr/lib/os-release < /usr/lib/system-release-cpe < /usr/lib/system-release < /usr/lib/issue <" -# This ensures we're semver-compatible which OpenShift wants -automatic-version-suffix: "-" - -mutate-os-release: "9.4" - -# Packages that are only in RHCOS and not in SCOS or that have special -# constraints that do not apply to SCOS -packages: - # We include the generic release package and tweak the os-release info in a - # post-process script - - redhat-release