Fix 9- to 9.2- for 4.14

openshift · Mar 20, 2023 · 630c049 · 630c049
1 parent c0ca55d
commit 630c049
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
@@ -92,7 +92,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-server-ose-4.14/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo"
+            awk '/rhel-9.2-server-ose-4.14/,/^$/' "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
@@ -26,7 +26,7 @@ repos:
   - okd-copr
   - podman-next-copr
   # Include RHCOS 9 repo for oc, hyperkube and conmon-rs
-  - rhel-9-server-ose-4.14
+  - rhel-9.2-server-ose-4.14
 
 # We include hours/minutes to avoid version number reuse
 automatic-version-prefix: "414.9.<date:%Y%m%d%H%M>"

diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml
@@ -21,7 +21,7 @@ repos:
   - rhel-9.2-appstream
   - rhel-9.2-fast-datapath
   - rhel-9.2-server-ose-4.13  # FIXME a few things are built only in 4.13 right now, like podman
-  - rhel-9-server-ose-4.14
+  - rhel-9.2-server-ose-4.14
 
 # We include hours/minutes to avoid version number reuse
 automatic-version-prefix: "414.92.<date:%Y%m%d%H%M>"
@@ -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-server-ose-4.14
+  - repo: rhel-9.2-server-ose-4.14
     packages:
       - conmon-rs
       - cri-o