Skip to content

USHIFT-2475: The build_images.sh script exits with error if depsolve stage fails #3483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 17, 2024
Merged

USHIFT-2475: The build_images.sh script exits with error if depsolve stage fails #3483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions test/bin/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ do_group() {
template_list=$(echo "${groupdir}"/*source*.toml)
fi
fi

local failed_depsolve=()
for template in ${template_list}; do
echo
echo "Blueprint ${template}"
Expand Down Expand Up @@ -333,6 +335,11 @@ do_group() {
record_junit "${groupdir}" "${blueprint}" "depsolve" "OK"
else
record_junit "${groupdir}" "${blueprint}" "depsolve" "FAILED"
# Log an error and proceed with the build by skipping the failed blueprint.
# The error will be reported in the end of the procedure.
echo "ERROR: Failed to solve dependences for '${blueprint}' blueprint - skipping"
failed_depsolve+=("${blueprint}")
continue
fi

if ${COMPOSER_DRY_RUN} ; then
Expand Down Expand Up @@ -482,7 +489,7 @@ do_group() {
echo "Downloading build logs, metadata, and image"
cd "${IMAGEDIR}/builds"

failed_builds=()
local failed_builds=()
# shellcheck disable=SC2231 # allow glob expansion without quotes in for loop
for buildid in ${builds_to_get}; do
# shellcheck disable=SC2086 # pass glob args without quotes
Expand Down Expand Up @@ -530,10 +537,16 @@ do_group() {
record_junit "${groupdir}" "${build_name}" "compose" "OK"
done

# Exit the function on build errors
if [ ${#failed_builds[@]} -ne 0 ] ; then
echo "Error: check the failed build jobs"
echo "${failed_builds[@]}"
# Exit the function on dependency or build errors
if [ ${#failed_builds[@]} -ne 0 ] || [ ${#failed_depsolve[@]} -ne 0 ] ; then
if [ ${#failed_depsolve[@]} -ne 0 ] ; then
echo "Error: check the failed blueprints dependency"
echo "${failed_depsolve[@]}"
fi
if [ ${#failed_builds[@]} -ne 0 ] ; then
echo "Error: check the failed build jobs"
echo "${failed_builds[@]}"
fi
return 1
fi

Expand Down