diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 5b35aaf3c..69c69ba84 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -271,13 +271,13 @@ main () { cosa_build kola_test_metal ;; - "rhcos-90-build-test-qemu") + "rhcos-92-build-test-qemu"|"rhcos-90-build-test-qemu") setup_user cosa_init "rhel-coreos-9" cosa_build kola_test_qemu ;; - "rhcos-90-build-test-metal" ) + "rhcos-92-build-test-metal"|"rhcos-90-build-test-metal") setup_user cosa_init "rhel-coreos-9" cosa_build diff --git a/common-el9.yaml b/common-el9.yaml index b1249b791..cf782e3f9 100644 --- a/common-el9.yaml +++ b/common-el9.yaml @@ -3,6 +3,10 @@ include: - fedora-coreos-config/manifests/shared-el9.yaml +# EL9 specific overlays +ostree-layers: + - overlay/07el9 + postprocess: # Collection of workarounds specific to EL9 variants - | diff --git a/copr:copr.fedorainfracloud.org:amoralej:openvswitch-s390x.repo b/copr:copr.fedorainfracloud.org:amoralej:openvswitch-s390x.repo new file mode 100644 index 000000000..12df74f74 --- /dev/null +++ b/copr:copr.fedorainfracloud.org:amoralej:openvswitch-s390x.repo @@ -0,0 +1,11 @@ +# See https://lists.centos.org/pipermail/centos-devel/2023-January/142752.html +[copr:copr.fedorainfracloud.org:amoralej:openvswitch-s390x] +name=Copr repo for openvswitch-s390x owned by amoralej +baseurl=https://download.copr.fedorainfracloud.org/results/amoralej/openvswitch-s390x/centos-stream-9-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://download.copr.fedorainfracloud.org/results/amoralej/openvswitch-s390x/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 diff --git a/extensions-rhel-9.2.yaml b/extensions-rhel-9.2.yaml new file mode 100644 index 000000000..87fd809a5 --- /dev/null +++ b/extensions-rhel-9.2.yaml @@ -0,0 +1,63 @@ +# 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 + +repos: + # - rhel-9.0-nfv + - sig-virtualization + +extensions: + # 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: + - nfv + packages: + - kernel-rt-core + - kernel-rt-kvm + - kernel-rt-modules + - kernel-rt-modules-extra + - kernel-rt-devel + # 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 (RHAOS) + sandboxed-containers: + architectures: + - x86_64 + repos: + # - rhel-9.0-appstream + - sig-virtualization + packages: + - kata-containers diff --git a/extensions-rhel-coreos-9.yaml b/extensions-rhel-coreos-9.yaml index 2c9b9f9c4..0e6ab74a7 120000 --- a/extensions-rhel-coreos-9.yaml +++ b/extensions-rhel-coreos-9.yaml @@ -1 +1 @@ -extensions-rhel-9.0.yaml \ No newline at end of file +extensions-rhel-9.2.yaml \ No newline at end of file diff --git a/image-rhel-9.2.yaml b/image-rhel-9.2.yaml new file mode 100644 index 000000000..17c8d9cc8 --- /dev/null +++ b/image-rhel-9.2.yaml @@ -0,0 +1,17 @@ +# See https://github.com/coreos/coreos-assembler/pull/298 +size: 16 + +# 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: [] + +# 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 diff --git a/image-rhel-coreos-9.yaml b/image-rhel-coreos-9.yaml index b367c9480..08d232924 120000 --- a/image-rhel-coreos-9.yaml +++ b/image-rhel-coreos-9.yaml @@ -1 +1 @@ -image-rhel-9.0.yaml \ No newline at end of file +image-rhel-9.2.yaml \ No newline at end of file diff --git a/kola-denylist.yaml b/kola-denylist.yaml index 8482e3ca1..64478e77f 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -42,9 +42,18 @@ # Broken tests for EL9 under investigation - pattern: ext.config.shared.podman.rootless-systemd tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2123246 - osversion: - - c9s - - rhel-9.0 + +# We're using some COPR stuff intentionally +- pattern: ext.config.shared.content-origins + tracker: '' + +# Temporary while we're using C9S +- pattern: ext.config.version.rhel-matches-rhcos-build + tracker: '' + +# This test is broken +- pattern: ext.config.shared.networking.default-network-behavior-change + tracker: '' # Temporary to unblock COSA CI - pattern: ext.config.shared.clhm.network-device-info diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index d6d9a5741..e68b3ea4b 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -16,10 +16,6 @@ include: # Starting from here, everything should be specific to SCOS -# SCOS specific overlays -ostree-layers: - - overlay/07c9s - # CentOS Stream 9 repos + internal repos for now repos: - baseos @@ -27,10 +23,10 @@ repos: # For NFV & Virtualization SIG GPG keys - extras-common - sig-nfv - # Include RHCOS 9 repo for oc, hyperkube, cri-o, conmon-rs + # OKD SCOS builds of cri-o & cri-tools + - okd-copr + # Include RHCOS 9 repo for oc, hyperkube and conmon-rs - rhel-9.0-server-ose-4.13 - # Use this repo to build SCOS with OKD SCOS packages - # - okd-copr # We include hours/minutes to avoid version number reuse automatic-version-prefix: "413.9." @@ -138,14 +134,7 @@ repo-packages: - nss-altfiles # Use the new containers/toolbox - toolbox - - repo: rhel-9.0-server-ose-4.13 + - repo: okd-copr packages: - - conmon-rs - cri-o - cri-tools - - openshift-clients - - openshift-hyperkube - # - repo: okd-copr - # packages: - # - cri-o - # - cri-tools diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml new file mode 100644 index 000000000..7932ee1d6 --- /dev/null +++ b/manifest-rhel-9.2.yaml @@ -0,0 +1,157 @@ +# Manifest for RHCOS based on RHEL 9.2 (C9S for now) + +rojig: + license: MIT + name: rhcos + summary: OpenShift 4 + +variables: + osversion: "rhel-9.2" + +# Include manifests common to all RHEL and CentOS Stream versions and manifest +# common to RHEL 9 & C9S variants +include: + - common.yaml + - common-el9.yaml + +# Starting from here, everything should be specific to RHCOS based on RHEL 9.2 + +# See "Notes about repositories" in `docs/development.md` +repos: + - baseos + - appstream + # For NFV & Virtualization SIG GPG keys + - extras-common + - sig-nfv + # Include RHCOS 9.0 repo for oc, hyperkube, cri-o, conmon-rs + - rhel-9.0-server-ose-4.13 + # Uncomment and switch to the following once ready + # - rhel-9.2-baseos + # - rhel-9.2-appstream + # - rhel-9.2-fast-datapath + # - rhel-9.2-server-ose-4.13 + +arch-include: + s390x: + # Temporary repo for openvswitch on s390x + # See: https://lists.centos.org/pipermail/centos-devel/2023-January/142752.html + - openvswitch-s390x.yaml + +# We include hours/minutes to avoid version number reuse +automatic-version-prefix: "413.92." +# 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.13" + +postprocess: + - | + #!/usr/bin/env bash + set -xeo pipefail + + # Tweak /usr/lib/os-release + grep -v "OSTREE_VERSION" /etc/os-release > /usr/lib/os-release.rhel + OCP_RELEASE="4.13" + ( + . /etc/os-release + cat > /usr/lib/os-release < /usr/lib/system-release-cpe < /usr/lib/system-release < /usr/lib/issue < /etc/motd <