Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
35 changes: 0 additions & 35 deletions select_version.sh

This file was deleted.