Skip to content

Commit

Permalink
ci/prow-entrypoint.sh: update CI for 9.4
Browse files Browse the repository at this point in the history
4.16 is switching to 9.4 beta content. We should probably clean up
all references to 9.2 but lets keep the references until we get
closer to GA.
  • Loading branch information
mike-nguyen committed Apr 3, 2024
1 parent 98a956c commit 2644efc
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,18 @@ prepare_repos() {
rhelver=$(rpm-ostree compose tree --print-only "${manifest}" | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.)

# Temporary workaround until we publish builds in the default path
if [[ "${rhelver}" == "92" ]]; then
prev_build_url="${REDIRECTOR_URL}/${ocpver}-9.2/builds/"
if [[ "${rhelver}" == "94" ]]; then
prev_build_url="${REDIRECTOR_URL}/${ocpver}-9.4/builds/"
# Fetch the previous build
cosa buildfetch --url="${prev_build_url}"
fi

# Fetch the repos corresponding to the release we are building
case "${rhelver}" in
92)
92|94)
curl --fail -L "http://base-${ocpver_mut}-rhel${rhelver}.ocp.svc.cluster.local" -o "src/config/ocp.repo"
cat src/config/ocp.repo
;;
94)
# For now, the 9.4 variant is mostly C9S, but we do still need some packages from 9.2 repos
curl --fail -L "http://base-${ocpver_mut}-rhel92.ocp.svc.cluster.local" -o "src/config/ocp.repo"
cat src/config/ocp.repo
;;
*)
# Assume C9S/SCOS if the version does not match known values for RHEL
# Temporary workaround until we have all packages for SCOS
Expand Down

0 comments on commit 2644efc

Please sign in to comment.