From aa98251b288c65b44dca6f31dcd0209e690e0f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 20 Jul 2022 09:53:35 +0200 Subject: [PATCH 1/4] manifests: Move rpm-ostree workaround to RHEL 8 only See: https://github.com/openshift/os/pull/900 Fixes: https://github.com/openshift/os/pull/900/commits/caae760c01eeadd59a7ab51b7c8771a06a0ee8d1 --- common.yaml | 1 - rhel-8.6.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/common.yaml b/common.yaml index 49cdb606f..c59c7fd71 100644 --- a/common.yaml +++ b/common.yaml @@ -16,7 +16,6 @@ ostree-layers: - overlay/05rhcos - overlay/06gcp-routes - overlay/15rhcos-tuned-bits - - overlay/15rhcos-rhel8-workarounds # TODO conditionalize on rhel8 - overlay/20platform-chrony - overlay/21dhcp-chrony diff --git a/rhel-8.6.yaml b/rhel-8.6.yaml index 5bdd22418..200211d43 100644 --- a/rhel-8.6.yaml +++ b/rhel-8.6.yaml @@ -18,6 +18,7 @@ include: ostree-layers: # Temporary logrotate service and timer units - overlay/15rhcos-logrotate + - overlay/15rhcos-rhel8-workarounds - overlay/25rhcos-azure-udev # See README.md From 987ef28264ee9a118d631da8e23b765b38132668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 19 Jul 2022 17:45:57 +0200 Subject: [PATCH 2/4] manifests: Prepare for variant support in COSA --- image-rhel-8.6.yaml | 1 + rhel-8.6.yaml => manifest-rhel-8.6.yaml | 0 manifest.yaml | 2 +- variant_default | 1 + variant_rhcos | 1 + variant_rhel-8.6 | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) create mode 120000 image-rhel-8.6.yaml rename rhel-8.6.yaml => manifest-rhel-8.6.yaml (100%) create mode 120000 variant_default create mode 120000 variant_rhcos create mode 100644 variant_rhel-8.6 diff --git a/image-rhel-8.6.yaml b/image-rhel-8.6.yaml new file mode 120000 index 000000000..f10734e0b --- /dev/null +++ b/image-rhel-8.6.yaml @@ -0,0 +1 @@ +image.yaml \ No newline at end of file diff --git a/rhel-8.6.yaml b/manifest-rhel-8.6.yaml similarity index 100% rename from rhel-8.6.yaml rename to manifest-rhel-8.6.yaml diff --git a/manifest.yaml b/manifest.yaml index e3f5abc13..a39e7cfaa 120000 --- a/manifest.yaml +++ b/manifest.yaml @@ -1 +1 @@ -rhel-8.6.yaml \ No newline at end of file +manifest-rhel-8.6.yaml \ No newline at end of file diff --git a/variant_default b/variant_default new file mode 120000 index 000000000..e5959cac9 --- /dev/null +++ b/variant_default @@ -0,0 +1 @@ +variant_rhel-8.6 \ No newline at end of file diff --git a/variant_rhcos b/variant_rhcos new file mode 120000 index 000000000..e5959cac9 --- /dev/null +++ b/variant_rhcos @@ -0,0 +1 @@ +variant_rhel-8.6 \ No newline at end of file diff --git a/variant_rhel-8.6 b/variant_rhel-8.6 new file mode 100644 index 000000000..23c7ea772 --- /dev/null +++ b/variant_rhel-8.6 @@ -0,0 +1 @@ +rhel-8.6 From 4477062228fd984881f77e2a54e0858f8eb9f6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 19 Jul 2022 17:46:48 +0200 Subject: [PATCH 3/4] manifests: Add RHEL 9.0 variant Only add the manifests and do not enable CI yet. --- extensions-rhel-9.0.yaml | 62 +++++++++++++++ image-rhel-9.0.yaml | 1 + manifest-rhel-9.0.yaml | 161 +++++++++++++++++++++++++++++++++++++++ variant_rhel-9.0 | 1 + 4 files changed, 225 insertions(+) create mode 100644 extensions-rhel-9.0.yaml create mode 120000 image-rhel-9.0.yaml create mode 100644 manifest-rhel-9.0.yaml create mode 100644 variant_rhel-9.0 diff --git a/extensions-rhel-9.0.yaml b/extensions-rhel-9.0.yaml new file mode 100644 index 000000000..f3e241d8a --- /dev/null +++ b/extensions-rhel-9.0.yaml @@ -0,0 +1,62 @@ +# 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-nfv + +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 + 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 + modules: + enable: + - virt:rhel + repos: + - rhel-9-appstream + packages: + - kata-containers diff --git a/image-rhel-9.0.yaml b/image-rhel-9.0.yaml new file mode 120000 index 000000000..d7d2edf92 --- /dev/null +++ b/image-rhel-9.0.yaml @@ -0,0 +1 @@ +image-rhel-8.6.yaml \ No newline at end of file diff --git a/manifest-rhel-9.0.yaml b/manifest-rhel-9.0.yaml new file mode 100644 index 000000000..43f0b77f4 --- /dev/null +++ b/manifest-rhel-9.0.yaml @@ -0,0 +1,161 @@ +# Manifest for RHCOS based on RHEL 9.0 + +rojig: + license: MIT + name: rhcos + summary: OpenShift 4 + +variables: + distro: "rhel" + version: "9.0" + +# Include manifests common to all RHEL and CentOS Stream versions +include: + - common.yaml + +# Starting from here, everything should be specific to RHCOS based on RHEL 9.0 + +# See README.md +# and https://github.com/openshift/release/blob/master/core-services/release-controller/README.md#rpm-mirrors +repos: + - rhel-9-baseos + - rhel-9-appstream + - rhel-9-fast-datapath + # Temporarily disabled until available + # - rhel-9-server-ose + - rhel-8-server-ose + +# We include hours/minutes to avoid version number reuse +automatic-version-prefix: "412.90." +# 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.12" + +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.12" + ( + . /etc/os-release + cat > /usr/lib/os-release < /usr/lib/system-release-cpe < /usr/lib/system-release < /usr/lib/issue < /etc/motd <> /etc/crio/crio.conf < Date: Tue, 19 Jul 2022 19:35:43 +0200 Subject: [PATCH 4/4] manifests: Add SCOS variant Only add the manifests and do not enable CI yet. --- extensions-c9s.yaml | 62 +++++++++++++++++++ image-c9s.yaml | 1 + manifest-c9s.yaml | 142 ++++++++++++++++++++++++++++++++++++++++++++ repos/c9s.repo | 39 ++++++++++++ variant_scos | 1 + 5 files changed, 245 insertions(+) create mode 100644 extensions-c9s.yaml create mode 120000 image-c9s.yaml create mode 100644 manifest-c9s.yaml create mode 100644 repos/c9s.repo create mode 100644 variant_scos diff --git a/extensions-c9s.yaml b/extensions-c9s.yaml new file mode 100644 index 000000000..bc841d11c --- /dev/null +++ b/extensions-c9s.yaml @@ -0,0 +1,62 @@ +# 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: + - nfv + +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 + 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 + modules: + enable: + - virt:rhel + repos: + - appstream + packages: + - kata-containers diff --git a/image-c9s.yaml b/image-c9s.yaml new file mode 120000 index 000000000..d7d2edf92 --- /dev/null +++ b/image-c9s.yaml @@ -0,0 +1 @@ +image-rhel-8.6.yaml \ No newline at end of file diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml new file mode 100644 index 000000000..6bd1fa55e --- /dev/null +++ b/manifest-c9s.yaml @@ -0,0 +1,142 @@ +# Manifest for CentOS Stream CoreOS (SCOS) + +rojig: + license: MIT + name: scos + summary: OKD 4 + +variables: + distro: "scos" + version: "9" + +# Include manifests common to all RHEL and CentOS Stream versions +include: + - common.yaml + +# Starting from here, everything should be specific to SCOS + +# CentOS Stream 9 repos + internal repos for now +repos: + - baseos + - appstream + - openvswitch + # Temporarily include RHCOS 8 repo for cri-o, oc & hyperkube + - rhel-8-server-ose + +# We include hours/minutes to avoid version number reuse +automatic-version-prefix: "412.91." +# 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.12" + +postprocess: + - | + #!/usr/bin/env bash + set -xeo pipefail + + # Tweak /usr/lib/os-release + grep -v "OSTREE_VERSION" /etc/os-release > /usr/lib/os-release.stream + OCP_RELEASE="4.12" + ( + . /etc/os-release + cat > /usr/lib/os-release < /usr/lib/system-release-cpe < /usr/lib/system-release < /usr/lib/issue < /etc/motd <> /etc/crio/crio.conf <