diff --git a/Containerfile b/Containerfile index c0989c91..924c5c49 100644 --- a/Containerfile +++ b/Containerfile @@ -29,15 +29,7 @@ FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos as build ARG OPENSHIFT_CI=0 -# Avoid shipping modified .pyc files. Due to https://github.com/ostreedev/ostree/issues/1469, -# any Python apps that run (e.g. dnf) will cause pyc creation. -RUN --mount=type=bind,target=/run/src --mount=type=secret,id=yumrepos,target=/etc/yum.repos.d/secret.repo \ - find /usr -name '*.pyc' -exec mv {} {}.bak \; && \ - if [ "${OPENSHIFT_CI}" != 0 ]; then /run/src/ci/get-ocp-repo.sh --ocp-layer /run/src/packages-openshift.yaml --output-dir /etc/yum.repos.d; fi && \ - /run/src/scripts/apply-manifest /run/src/packages-openshift.yaml && \ - if [ "${OPENSHIFT_CI}" != 0 ]; then /run/src/ci/get-ocp-repo.sh --output-dir /etc/yum.repos.d --cleanup; fi && \ - find /usr -name '*.pyc.bak' -exec sh -c 'mv $1 ${1%.bak}' _ {} \; && \ - ostree container commit +RUN --mount=type=bind,target=/run/src --mount=type=secret,id=yumrepos,target=/etc/yum.repos.d/secret.repo /run/src/build-node-image.sh FROM build as metadata RUN --mount=type=bind,target=/run/src /run/src/scripts/generate-metadata diff --git a/README.md b/README.md index 425537e3..6f5008c7 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,6 @@ supported: - `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. -- `okd-c9s`: CentOS Stream-based CoreOS, including OpenShift components. This - currently includes some packages from RHEL because not all packages required - 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.X`/`c9s` images. diff --git a/build-node-image.sh b/build-node-image.sh new file mode 100755 index 00000000..81c2f578 --- /dev/null +++ b/build-node-image.sh @@ -0,0 +1,43 @@ +#!/bin/bash +set -euo pipefail + +# This script builds the OpenShift node image. It's called from `Containerfile`. set -xeuo pipefail + +# Avoid shipping modified .pyc files. Due to +# https://github.com/ostreedev/ostree/issues/1469, any Python apps that +# run (e.g. dnf) will cause pyc creation. We do this by backing them up and +# restoring them at the end. +find /usr -name '*.pyc' -exec mv {} {}.bak \; + +# fetch repos from in-cluster mirrors if we're running in OpenShift CI +if [ "${OPENSHIFT_CI}" != 0 ]; then + /run/src/ci/get-ocp-repo.sh /etc/yum.repos.d/ocp.repo +fi + +source /etc/os-release + +# XXX: For SCOS, only allow certain packages to come from ART; everything else +# should come from CentOS. We should eventually sever this. +if [ $ID = centos ]; then + # this says: "if the line starts with [.*], turn off printing. if the line starts with [our-repo], turn it on." + awk "/\[.*\]/{p=0} /\[rhel-9.6-server-ose-4.19\]/{p=1} p" /etc/yum.repos.d/*.repo > /etc/yum.repos.d/okd.repo.tmp + sed -i -e 's,rhel-9.6-server-ose-4.19,rhel-9.6-server-ose-4.19-okd,' /etc/yum.repos.d/okd.repo.tmp + echo 'includepkgs=openshift-*,ose-aws-ecr-*,ose-azure-acr-*,ose-gcp-gcr-*' >> /etc/yum.repos.d/okd.repo.tmp + mv /etc/yum.repos.d/okd.repo{.tmp,} +fi + +# XXX: patch cri-o spec to use tmpfiles +# https://github.com/CentOS/centos-bootc/issues/393 +mkdir -p /var/opt + +# this is where all the real work happens +rpm-ostree experimental compose treefile-apply \ + --var id=$ID /run/src/packages-openshift.yaml + +# cleanup the repo file we injected +if [ "${OPENSHIFT_CI}" != 0 ]; then + rm /etc/yum.repos.d/ocp.repo +fi + +find /usr -name '*.pyc.bak' -exec sh -c 'mv $1 ${1%.bak}' _ {} \; +ostree container commit diff --git a/c9s-mirror.repo b/c9s-mirror.repo index 00b1c62c..801dada3 100644 --- a/c9s-mirror.repo +++ b/c9s-mirror.repo @@ -9,7 +9,7 @@ baseurl=https://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-appstream-mirror] name=CentOS Stream 9 - AppStream @@ -17,7 +17,7 @@ baseurl=https://mirror.stream.centos.org/9-stream/AppStream/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-nfv-mirror] name=CentOS Stream 9 - NFV @@ -25,7 +25,7 @@ baseurl=https://mirror.stream.centos.org/9-stream/NFV/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-rt-mirror] name=CentOS Stream 9 - RT @@ -33,4 +33,4 @@ baseurl=https://mirror.stream.centos.org/9-stream/RT/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/c9s.repo b/c9s.repo index 8bad37fb..0297db80 100644 --- a/c9s.repo +++ b/c9s.repo @@ -10,7 +10,7 @@ baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compo gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-appstream] name=CentOS Stream 9 - AppStream @@ -18,7 +18,7 @@ baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compo gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-extras-common] name=CentOS Stream 9 - Extras packages @@ -29,7 +29,7 @@ baseurl=https://mirror.stream.centos.org/SIGs/9-stream/extras/x86_64/extras-comm gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 [c9s-nfv] name=CentOS Stream 9 - NFV @@ -37,7 +37,7 @@ baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compo gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-rt] name=CentOS Stream 9 - RT @@ -45,7 +45,7 @@ baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compo gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial [c9s-sig-nfv] name=CentOS Stream 9 - SIG NFV @@ -53,7 +53,7 @@ baseurl=https://mirror.stream.centos.org/SIGs/9-stream/nfv/$basearch/openvswitch gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV [c9s-sig-virtualization] name=CentOS Stream 9 - SIG Virtualization @@ -61,7 +61,7 @@ baseurl=https://mirror.stream.centos.org/SIGs/9-stream/virt/$basearch/kata-conta gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization [c9s-sig-cloud-okd] name=CentOS Stream 9 - SIG Cloud OKD 4.19 @@ -69,4 +69,4 @@ baseurl=https://mirror.stream.centos.org/SIGs/9-stream/cloud/$basearch/okd-4.19/ gpgcheck=1 repo_gpgcheck=0 enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Cloud +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud diff --git a/ci/get-ocp-repo.sh b/ci/get-ocp-repo.sh index 4fb06fa7..95ed35ef 100755 --- a/ci/get-ocp-repo.sh +++ b/ci/get-ocp-repo.sh @@ -3,203 +3,21 @@ set -euo pipefail # This script is used when running within the OpenShift CI clusters to fetch # the RHEL and OCP yum repo files from an in-cluster service that mirrors the -# content. It's called from three places: -# - prow-entrypoint.sh: CI tests that build & and test different variants -# - extensions/Dockerfile: when building the extensions container in OpenShift CI -# - Containerfile: when building the node image in CI +# content. -print_usage_and_exit() { - cat 1>&2 <<'EOF' -Usage: $0 [OPTIONS] - - Fetch mirrored RHEL/OCP yum repo files from OpenShift CI's in-cluster service. - The following modes are supported: - - --cosa-workdir PATH Get RHEL and OCP versions from manifests in cosa workdir - --ocp-layer MANIFEST Get RHEL version from /usr/lib/os-release and OCP version from manifest - - The following options are supported - - --output-dir PATH Directory to which to output ocp.repo file -EOF - exit 1 -} - -info() { - echo "INFO:" "$@" >&2 -} - -cleanup_repos() { - # if we had installed the packages and created symlinks, remove it - if rpm -q centos-release-cloud; then - dnf remove -y centos-release-{cloud,nfv,virt}-common - find "/usr/share/distribution-gpg-keys/centos" -type l -exec rm -f {} \; - echo "Removed all symbolic links and packages installed for scos" - fi - # remove ocp.repo file - if [ -n "$ocp_manifest" ]; then - if [ -z "$output_dir" ]; then - output_dir=$(dirname "$ocp_manifest") - fi - else - if [ -z "$output_dir" ]; then - output_dir="$cosa_workdir/src/config" - fi - fi - rm "$output_dir/ocp.repo" - echo "Removed repo file $output_dir/ocp.repo" -} - -create_gpg_keys() { - # Check if centos-stream-release is installed and centos-release-cloud is not - # enablerepo added in case the repo is disabled (when building extensions) - if rpm -q centos-stream-release && ! rpm -q centos-release-cloud; then - dnf install -y centos-release-{cloud,nfv,virt}-common --enablerepo extras-common - fi - - # Create directory for CentOS distribution GPG keys - mkdir -p /usr/share/distribution-gpg-keys/centos - # Create symbolic links for GPG keys - if [ ! -e "/usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official" ]; then - ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Cloud - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-NFV - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Virtualization - fi -} - -cosa_workdir= -ocp_manifest= -output_dir= -rc=0 -options=$(getopt --options h --longoptions help,cosa-workdir:,ocp-layer:,output-dir:,cleanup -- "$@") || rc=$? -[ $rc -eq 0 ] || print_usage_and_exit -eval set -- "$options" -while [ $# -ne 0 ]; do - case "$1" in - -h | --help) print_usage_and_exit;; - --cosa-workdir) cosa_workdir=$2; shift;; - --ocp-layer) ocp_manifest=$2; shift;; - --output-dir) output_dir=$2; shift;; - --cleanup) cleanup_repos; exit 0;; - --) break;; - *) echo "$0: invalid argument: $1" >&2; exit 1;; - esac - shift -done - -if [ -n "$ocp_manifest" ]; then - # --ocp-layer path - ocp_version=$(rpm-ostree compose tree --print-only "$ocp_manifest" | jq -r '.metadata.ocp_version') - ocp_version=${ocp_version//./-} - info "Got OpenShift version $ocp_version from $ocp_manifest" - # osname is used lower down, so set it - osname=$(source /usr/lib/os-release; if [ $ID == centos ]; then echo scos; fi) - - if [ -z "$output_dir" ]; then - output_dir=$(dirname "$ocp_manifest") - fi - - # get rhel version corresponding to the release so we can get the - # correct OpenShift rpms from those for scos. These packages are not - # available in CentOS Stream - if [ "$osname" = scos ]; then - workdir=$(dirname "$ocp_manifest") - manifest="$workdir/manifest.yaml" - json=$(rpm-ostree compose tree --print-only "$manifest") - version=$(jq -r '.["automatic-version-prefix"]' <<< "$json") - rhel_version=$(cut -f2 -d. <<< "$version") - info "Got RHEL version $rhel_version from rhel manifest for scos" - else - rhel_version=$(source /usr/lib/os-release; echo ${VERSION_ID//./}) - info "Got RHEL version $rhel_version from /usr/lib/os-release" - fi -else - [ -n "$cosa_workdir" ] - # --cosa-workdir path - - # the OCP version always comes from packages-openshift.yaml - ocp_version=$(rpm-ostree compose tree --print-only "$cosa_workdir/src/config/packages-openshift.yaml" | jq -r '.metadata.ocp_version') - ocp_version=${ocp_version//./-} - info "Got OpenShift version $ocp_version from packages-openshift.yaml" - - # the RHEL version comes from the target manifest - - # first, make sure we're looking at the right manifest - manifest="$cosa_workdir/src/config/manifest.yaml" - if [ -f "$cosa_workdir/src/config.json" ]; then - variant="$(jq --raw-output '."coreos-assembler.config-variant"' 'src/config.json')" - manifest="$cosa_workdir/src/config/manifest-${variant}.yaml" - fi - - # flatten manifest and query a couple of fields - json=$(rpm-ostree compose tree --print-only "$manifest") - osname=$(jq -r '.metadata.name' <<< "$json") - is_ocp_variant=$(jq '.packages | contains(["cri-o"])' <<< "$json") - - if [ "$osname" = scos ] && [ "$is_ocp_variant" = false ]; then - # this is the pure SCOS case; we don't need any additional repos at all - info "Building pure SCOS variant. Exiting..." - exit 0 - elif [ "$osname" = scos ]; then - # We still need the OCP repos for now unfortunately because not - # everything is in the Stream repo. For the RHEL version, just use the - # default variant's one. - json=$(rpm-ostree compose tree --print-only "$cosa_workdir/src/config/manifest.yaml") - fi - version=$(jq -r '.["automatic-version-prefix"]' <<< "$json") - if [ "$is_ocp_variant" = true ]; then - # RHEL version is second field - info "Building OCP variant" - rhel_version=$(cut -f2 -d. <<< "$version") - else - # RHEL version is first and second field - info "Building pure variant" - rhel_version=$(cut -f1-2 -d. <<< "$version") - rhel_version=${rhel_version//./} - fi - info "Got RHEL version $rhel_version from automatic-version-prefix value $version" - - if [ -z "$output_dir" ]; then - output_dir="$cosa_workdir/src/config" - fi -fi - -mkdir -p "$output_dir" -repo_path="$output_dir/ocp.repo" - -set -x -curl --fail -L "http://base-${ocp_version}-rhel${rhel_version}.ocp.svc.cluster.local" -o "$repo_path" -set +x - -if [ "${rhel_version}" = 96 ]; then - # XXX: also currently also add 9.4 repos for crun-wasm when building extensions +urls=( + # theoretically that's the only one we need + "http://base-4-19-rhel96.ocp.svc.cluster.local" + # XXX: but also currently add 9.4 repos for crun-wasm when building extensions # https://github.com/openshift/os/issues/1680 # https://github.com/openshift/os/pull/1682 # https://issues.redhat.com/browse/COS-3075 - curl --fail -L http://base-4-19-rhel94.ocp.svc.cluster.local >> "$repo_path" -fi + "http://base-4-19-rhel94.ocp.svc.cluster.local" +) -# If we're building the SCOS OKD variant, then strip away all the RHEL repos and just keep the plashet. -# Temporary workaround until we have all packages for SCOS in CentOS Stream. -if [ "$osname" = scos ]; then - info "Neutering RHEL repos for SCOS" - awk '/server-ose/,/^$/' "$repo_path" > "$repo_path.tmp" - # only pull in certain Openshift packages as the rest come from the c9s repo - sed -i '/^baseurl = /a includepkgs=openshift-* ose-aws-ecr-* ose-azure-acr-* ose-gcp-gcr-*' "$repo_path.tmp" - # add the contents of the CentOS Stream repo - workdir="$cosa_workdir/src/config" - if [ -n "$ocp_manifest" ]; then - workdir=$(dirname "$ocp_manifest") - fi - # pull in the mirror repo as well in case there are newer versions in the composes - # and we require older versions - this happens because we build the node images async - # and the composes move fast. - cat "$workdir/c9s.repo" >> "$repo_path.tmp" - cat "$workdir/c9s-mirror.repo" >> "$repo_path.tmp" - mv "$repo_path.tmp" "$repo_path" - create_gpg_keys -fi +dest=$1; shift -cat "$repo_path" +rm -f "$dest" +for url in "${urls[@]}"; do + curl --fail -L "$url" >> "$dest" +done diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 5ed7c214..d49a60e0 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -60,7 +60,7 @@ cosa_init() { # Initialize the .repo files prepare_repos() { - src/config/ci/get-ocp-repo.sh --cosa-workdir . + src/config/ci/get-ocp-repo.sh src/config/ocp.repo } # Do a cosa build & cosa build-extensions only. diff --git a/extensions-ocp-rhel-9.6.yaml b/extensions-ocp-rhel-9.6.yaml index ca919446..ae762ef8 100644 --- a/extensions-ocp-rhel-9.6.yaml +++ b/extensions-ocp-rhel-9.6.yaml @@ -13,12 +13,13 @@ extensions: # XXX: temporarily add rhel-9.4-appstream for crun-wasm # https://github.com/openshift/os/issues/1680 # https://issues.redhat.com/browse/COS-3075 - # NOTE: when reverting this, also revert the associated hack in get-ocp-repo.sh - rhel-9.4-appstream packages: - crun-wasm # https://github.com/coreos/fedora-coreos-tracker/issues/1504 ipsec: + repos: + - rhel-9.6-fast-datapath packages: - libreswan - NetworkManager-libreswan diff --git a/extensions-okd-c9s.yaml b/extensions-okd-c9s.yaml index 10b66887..460d1554 100644 --- a/extensions-okd-c9s.yaml +++ b/extensions-okd-c9s.yaml @@ -4,6 +4,13 @@ repos: - c9s-sig-virtualization + # Some of the extensions here have version bindings to host packages. Add the + # mirrors since those retain multiple versions of packages in case the latest + # compose has already moved since the last base image build. + - c9s-baseos-mirror + - c9s-appstream-mirror + - c9s-nfv-mirror + - c9s-rt-mirror extensions: # https://issues.redhat.com/browse/RFE-4177 @@ -57,9 +64,6 @@ extensions: - x86_64 repos: - c9s-nfv - # nfv-mirror is needed while building scos node images through CI in case the composes have already moved kernel version - # this is true for any other package as well - so we will need to find a better solution for this [TODO] - - c9s-nfv-mirror packages: - kernel-rt-core - kernel-rt-kvm diff --git a/extensions/Dockerfile b/extensions/Dockerfile index b78273bc..a6dd9165 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -7,9 +7,7 @@ RUN mkdir /os WORKDIR /os ADD . . ARG OPENSHIFT_CI=0 -ARG VARIANT="" -RUN if [ "${OPENSHIFT_CI}" != 0 ]; then ci/get-ocp-repo.sh --ocp-layer packages-openshift.yaml; fi -RUN --mount=type=secret,id=yumrepos,target=/os/secret.repo if [[ -n "${VARIANT}" ]]; then MANIFEST="manifest-${VARIANT}.yaml"; EXTENSIONS="extensions-${VARIANT}.yaml"; else MANIFEST="manifest.yaml"; EXTENSIONS="extensions.yaml"; fi && rpm-ostree compose extensions --rootfs=/ --output-dir=/usr/share/rpm-ostree/extensions/ ./"${MANIFEST}" ./"${EXTENSIONS}" +RUN --mount=type=secret,id=yumrepos,target=/os/secret.repo extensions/build.sh ## Creates the repo metadata for the extensions. ## This uses Fedora as a lowest-common-denominator because it will work on diff --git a/extensions/build.sh b/extensions/build.sh new file mode 100755 index 00000000..7d009075 --- /dev/null +++ b/extensions/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -xeuo pipefail + +# fetch repos from in-cluster mirrors if we're running in OpenShift CI +if [ "${OPENSHIFT_CI}" != 0 ]; then + ci/get-ocp-repo.sh ocp.repo +fi + +. /etc/os-release +# XXX: we can drop the rhcos check once we've dropped the `ocp-rhel-9.6` variant +if [ $ID = rhel ] || [ $ID = rhcos ]; then + MANIFEST="manifest-rhel-9.6.yaml" + EXTENSIONS="extensions-ocp-rhel-9.6.yaml" +else + MANIFEST="manifest-c9s.yaml" + EXTENSIONS="extensions-okd-c9s.yaml" +fi + +rpm-ostree compose extensions --rootfs=/ \ + --output-dir=/usr/share/rpm-ostree/extensions/ \ + "${MANIFEST}" "${EXTENSIONS}" + diff --git a/image-okd-c9s.yaml b/image-okd-c9s.yaml deleted file mode 120000 index 56168f45..00000000 --- a/image-okd-c9s.yaml +++ /dev/null @@ -1 +0,0 @@ -image-c9s.yaml \ No newline at end of file diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index b46b20b1..6cd434e6 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -6,6 +6,7 @@ metadata: summary: CentOS Stream CoreOS 9 variables: + id: "centos" osversion: "c9s" inherit_tier_x: true diff --git a/manifest-okd-c9s.yaml b/manifest-okd-c9s.yaml deleted file mode 100644 index 0b7e664e..00000000 --- a/manifest-okd-c9s.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# Manifest for OKD node based on CentOS Stream CoreOS 9 -# Note: this manifest is temporary; in the future, OKD components will be layered instead. - -metadata: - license: MIT - name: scos - summary: OKD 4.19 - -variables: - osversion: "c9s" - -include: - - manifest-c9s.yaml - - packages-openshift.yaml - -# Additional repos we need for OKD components -repos: - # 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.6-server-ose-4.19 - -# We include hours/minutes to avoid version number reuse -automatic-version-prefix: "419.9." -# 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.stream - ( - . /etc/os-release - cat > /usr/lib/os-release < /usr/lib/system-release-cpe < /usr/lib/system-release < /usr/lib/issue <