-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make c9s and rhel-9.4 variants be pure C9S/RHEL 9.4 content
This is the second step now in this switcheroo dance (see previous commit). We make the `c9s` and `rhel-9.4` variants contain only C9S/ RHEL 9.4 content and then make the `okd-c9s` and `ocp-rhel-9.4` variants inherit from those and add the OCP-specific stuff.
- Loading branch information
Showing
8 changed files
with
61 additions
and
230 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,123 +1,28 @@ | ||
| # Manifest for CentOS Stream CoreOS (SCOS) | ||
| # Manifest for CentOS Stream CoreOS 9 | ||
|
|
||
| rojig: | ||
| license: MIT | ||
| name: scos | ||
| summary: OKD 4 | ||
| summary: CentOS Stream CoreOS 9 | ||
|
|
||
| variables: | ||
| osversion: "c9s" | ||
|
|
||
| # Include manifests common to all RHEL and CentOS Stream versions and manifest | ||
| # common to RHEL 9 & C9S variants | ||
| # Include manifests common to all RHEL and CentOS Stream versions | ||
| include: | ||
| - common.yaml | ||
| - packages-openshift.yaml | ||
| - overrides-c9s.yaml | ||
|
|
||
| # Starting from here, everything should be specific to SCOS | ||
|
|
||
| # CentOS Stream 9 repos + internal repos for now | ||
| repos: | ||
| - c9s-baseos | ||
| - c9s-appstream | ||
| # CentOS Extras Common repo for SIG RPM GPG keys | ||
| - c9s-extras-common | ||
| # CentOS NFV SIG repo for openvswitch | ||
| - c9s-sig-nfv | ||
| # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs | ||
| - c9s-sig-cloud-okd | ||
| # Include RHCOS 9 repo for oc, hyperkube | ||
| - rhel-9.4-server-ose-4.17 | ||
|
|
||
| # We include hours/minutes to avoid version number reuse | ||
| automatic-version-prefix: "417.9.<date:%Y%m%d%H%M>" | ||
| # 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.17" | ||
|
|
||
| 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.stream | ||
| ( | ||
| . /etc/os-release | ||
| cat > /usr/lib/os-release <<EOF | ||
| NAME="${NAME} CoreOS" | ||
| ID="scos" | ||
| ID_LIKE="rhel fedora" | ||
| VERSION="${OSTREE_VERSION}" | ||
| VERSION_ID="${OPENSHIFT_VERSION}" | ||
| VARIANT="CoreOS" | ||
| VARIANT_ID=coreos | ||
| PLATFORM_ID="${PLATFORM_ID}" | ||
| PRETTY_NAME="${NAME} CoreOS ${OSTREE_VERSION}" | ||
| ANSI_COLOR="${ANSI_COLOR}" | ||
| CPE_NAME="${CPE_NAME}::coreos" | ||
| HOME_URL="${HOME_URL}" | ||
| DOCUMENTATION_URL="https://docs.okd.io/latest/welcome/index.html" | ||
| BUG_REPORT_URL="https://access.redhat.com/labs/rhir/" | ||
| REDHAT_BUGZILLA_PRODUCT="OpenShift Container Platform" | ||
| REDHAT_BUGZILLA_PRODUCT_VERSION="${OPENSHIFT_VERSION}" | ||
| REDHAT_SUPPORT_PRODUCT="OpenShift Container Platform" | ||
| REDHAT_SUPPORT_PRODUCT_VERSION="${OPENSHIFT_VERSION}" | ||
| OPENSHIFT_VERSION="${OPENSHIFT_VERSION}" | ||
| OSTREE_VERSION="${OSTREE_VERSION}" | ||
| EOF | ||
| ) | ||
| rm -f /etc/os-release | ||
| ln -s ../usr/lib/os-release /etc/os-release | ||
| # Eventually we should try to build these images as part of the c9s composes. | ||
| # In that case, the versioning should instead be exactly the same as the pungi | ||
| # compose ID. | ||
| automatic-version-prefix: "9.<date:%Y%m%d%H%M>" | ||
|
|
||
| # Tweak /etc/system-release, /etc/system-release-cpe & /etc/redhat-release | ||
| ( | ||
| . /etc/os-release | ||
| cat > /usr/lib/system-release-cpe <<EOF | ||
| ${CPE_NAME} | ||
| EOF | ||
| cat > /usr/lib/system-release <<EOF | ||
| ${NAME} release ${VERSION_ID} | ||
| EOF | ||
| rm -f /etc/system-release-cpe /etc/system-release /etc/redhat-release | ||
| ln -s /usr/lib/system-release-cpe /etc/system-release-cpe | ||
| ln -s /usr/lib/system-release /etc/system-release | ||
| ln -s /usr/lib/system-release /etc/redhat-release | ||
| ) | ||
| mutate-os-release: "9" | ||
|
|
||
| # Tweak /usr/lib/issue | ||
| cat > /usr/lib/issue <<EOF | ||
| \S \S{VERSION_ID} | ||
| EOF | ||
| rm -f /etc/issue /etc/issue.net | ||
| ln -s /usr/lib/issue /etc/issue | ||
| ln -s /usr/lib/issue /etc/issue.net | ||
| # Packages that are only in SCOS and not in RHCOS or that have special | ||
| # constraints that do not apply to RHCOS | ||
| packages: | ||
| # We include the generic release package and tweak the os-release info in a | ||
| # post-proces script | ||
| - centos-stream-release | ||
| # RPM GPG keys for CentOS SIG repos | ||
| - centos-release-cloud-common | ||
| - centos-release-nfv-common | ||
| - centos-release-virt-common | ||
|
|
||
| # Packages pinned to specific repos in SCOS 9 | ||
| repo-packages: | ||
| # We always want the kernel from BaseOS | ||
| - repo: c9s-baseos | ||
| packages: | ||
| - kernel | ||
| - repo: c9s-appstream | ||
| packages: | ||
| # We want the one shipping in C9S, not the equivalently versioned one in RHAOS | ||
| - nss-altfiles | ||
| # Use the new containers/toolbox | ||
| - toolbox | ||
| # The one shipping in C9S is temporarily lower versioned, so be explicit | ||
| # https://github.com/openshift/os/issues/1505 | ||
| - containers-common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.