From 630c04946f3ef5107a4a4bcdbade6be60acf9ea9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 20 Mar 2023 18:43:20 -0400 Subject: [PATCH] Fix 9- to 9.2- for 4.14 --- ci/prow-entrypoint.sh | 2 +- manifest-c9s.yaml | 2 +- manifest-rhel-9.2.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 5b29bceb..22e19283 100755 --- 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 index a45da1a6..5a096ebe 100644 --- 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." diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml index 48c120de..612e26f1 100644 --- 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." @@ -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