Merge pull request openshift#1334 from mike-nguyen/415_manifest

Update manifests and CI for 4.15
prestist · Sep 12, 2023 · cbd64d0 · cbd64d0
2 parents ad48601 + b157aa7
commit cbd64d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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.<date:%Y%m%d%H%M>"
+automatic-version-prefix: "415.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.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 <<EOF

diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml
@@ -21,14 +21,14 @@ repos:
   - rhel-9.2-baseos
   - rhel-9.2-appstream
   - rhel-9.2-fast-datapath
-  - 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.92.<date:%Y%m%d%H%M>"
+automatic-version-prefix: "415.92.<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.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 <<EOF
@@ -121,7 +121,7 @@ repo-packages:
     packages:
       # We want the one shipping in RHEL, not the equivalently versioned one in RHAOS
       - nss-altfiles
-  - repo: rhel-9.2-server-ose-4.14
+  - repo: rhel-9.2-server-ose-4.15
     packages:
       - conmon-rs
       - cri-o