diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index d4d114fb7..f3a30864b 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -46,15 +46,6 @@ cosa_init() { # Setup source tree cosa init --transient "${tmp_src}/os" - # Select RHEL os CentOS Stream version - # This must be defined for each test job entry point - if [[ -z ${RHELVER+x} ]]; then - echo "No RHEL or CentOS Stream version selected to build RHCOS/SCOS" - exit 1 - fi - pushd src/config - ./select_version.sh "${RHELVER}" - popd } # Do a cosa build & cosa build-extensions only. @@ -72,12 +63,8 @@ cosa_build() { cosa buildfetch --url="${prev_build_url}" # Fetch the repos corresponding to the release we are building - # Temporarily double checked until we have uniformity for all RHEL and - # CentOS versions - if [[ "${RHELVER}" == "rhel-8.6" ]]; then - rhelver=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.) - curl -L "http://base-${ocpver_mut}-rhel${rhelver}.ocp.svc.cluster.local" -o "src/config/ocp.repo" - fi + rhelver=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.) + curl -L "http://base-${ocpver_mut}-rhel${rhelver}.ocp.svc.cluster.local" -o "src/config/ocp.repo" # Fetch packages cosa fetch @@ -171,14 +158,12 @@ main () { cosa_build ;; "rhcos-cosa-prow-pr-ci" | "rhcos-86-build-test-qemu") - RHELVER="rhel-8.6" setup_user cosa_init cosa_build kola_test_qemu ;; "rhcos-86-build-test-metal") - RHELVER="rhel-8.6" setup_user cosa_init cosa_build diff --git a/select_version.sh b/select_version.sh deleted file mode 100755 index 75364c762..000000000 --- a/select_version.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Select the version of RHCOS or SCOS that you want to build from this repo -set -euxo pipefail - -# The current default for RHCOS in OCP 4.11 and later is RHEL 8.6 -RHELVER="rhel-8.6" - -main() { - local osver="" - local content_sets_required="false" - if [[ "$#" -ne 1 ]]; then - osver="$RHELVER" - else - osver="$1" - fi - - case "$osver" in - "rhel-8.6") - echo "Building RHCOS based on ${osver}" - content_sets_required="true" - ;; - *) - echo "Unknown OS version: ${osver}" - exit 1 - ;; - esac - - ln -snf "extensions-${osver}.yaml" "extensions.yaml" - ln -snf "${osver}.yaml" "manifest.yaml" - if [[ "${content_sets_required}" == "true" ]]; then - ln -snf "content_sets-${osver}.yaml" "content_sets.yaml" - fi -} - -main "${@}"