diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 0892e471..13522f6c 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -90,7 +90,7 @@ prepare_repos() { # Assume C9S/SCOS if the version does not match known values for RHEL # Temporary workaround until we have all packages for SCOS curl --fail -L "http://base-${ocpver_mut}-rhel92.ocp.svc.cluster.local" -o "src/config/tmp.repo" - awk '/rhel-9.2-server-ose-4.14/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo" + awk '/rhel-9.2-server-ose-4.15/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo" cat src/config/ocp90.repo rm "src/config/tmp.repo" ;; diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index 2690638c..d2ab2b75 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -27,14 +27,14 @@ repos: # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs - sig-cloud-okd # Include RHCOS 9 repo for oc, hyperkube - - rhel-9.2-server-ose-4.14 + - rhel-9.2-server-ose-4.15 # We include hours/minutes to avoid version number reuse -automatic-version-prefix: "414.9." +automatic-version-prefix: "415.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.14" +mutate-os-release: "4.15" postprocess: - | @@ -43,7 +43,7 @@ postprocess: # Tweak /usr/lib/os-release grep -v "OSTREE_VERSION" /etc/os-release > /usr/lib/os-release.stream - OCP_RELEASE="4.14" + OCP_RELEASE="4.15" ( . /etc/os-release cat > /usr/lib/os-release <" +automatic-version-prefix: "415.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.14" +mutate-os-release: "4.15" postprocess: - | @@ -37,7 +37,7 @@ postprocess: # Tweak /usr/lib/os-release grep -v "OSTREE_VERSION" /etc/os-release > /usr/lib/os-release.rhel - OCP_RELEASE="4.14" + OCP_RELEASE="4.15" ( . /etc/os-release cat > /usr/lib/os-release <