Skip to content

Commit b7e343d

Browse files
committed
Clean out all code relating to use of from-pr
1 parent 0154d64 commit b7e343d

File tree

1 file changed

+1
-36
lines changed

1 file changed

+1
-36
lines changed

check_missing_installations.sh

+1-36
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ easystack=$1
2525

2626
LOCAL_TMPDIR=$(mktemp -d)
2727

28-
# ~~No longer required as we use from-commit as of EB 4.9.something~~
29-
# Clone the develop branch of EasyBuild and use that to search for easyconfigs
30-
#
31-
#if [[ -z ${EASYBUILD_ROBOT_PATHS} ]]; then
32-
# git clone -b develop https://github.com/easybuilders/easybuild-easyconfigs.git $LOCAL_TMPDIR/easyconfigs
33-
# export EASYBUILD_ROBOT_PATHS=$LOCAL_TMPDIR/easyconfigs/easybuild/easyconfigs
34-
#fi
35-
#
36-
# All PRs used in EESSI are supposed to be merged, so we can strip out all cases of from-pr
37-
# tmp_easystack=${LOCAL_TMPDIR}/$(basename ${easystack})
38-
# grep -v from-pr ${easystack} > ${tmp_easystack}
39-
4028
source $TOPDIR/scripts/utils.sh
4129

4230
source $TOPDIR/configure_easybuild
@@ -46,34 +34,11 @@ ${EB:-eb} --show-config
4634

4735
echo ">> Checking for missing installations in ${EASYBUILD_INSTALLPATH}..."
4836
eb_missing_out=$LOCAL_TMPDIR/eb_missing.out
49-
${EB:-eb} --easystack ${tmp_easystack} --missing 2>&1 | tee ${eb_missing_out}
37+
${EB:-eb} --easystack ${easystack} --missing 2>&1 | tee ${eb_missing_out}
5038
exit_code=${PIPESTATUS[0]}
5139

5240
ok_msg="Command 'eb --missing ...' succeeded, analysing output..."
5341
fail_msg="Command 'eb --missing ...' failed, check log '${eb_missing_out}'"
54-
if [ "$exit_code" -ne 0 ] && [ ! -z "$pr_exceptions" ]; then
55-
# We might have failed due to unmerged PRs. Try to make exceptions for --from-pr added in this PR
56-
# to software-layer, and see if then it passes. If so, we can report a more specific fail_msg
57-
# Note that if no --from-pr's were used in this PR, $pr_exceptions will be empty and we might as
58-
# well skip this check - unmerged PRs can not be the reason for the non-zero exit code in that scenario
59-
60-
# Let's use awk so we can allow for exceptions if we are given a PR diff file
61-
awk_command="awk '\!/'from-pr'/ EXCEPTIONS' $easystack"
62-
awk_command=${awk_command/\\/} # Strip out the backslash we needed for !
63-
eval ${awk_command/EXCEPTIONS/$pr_exceptions} > ${tmp_easystack}
64-
65-
msg=">> Checking for missing installations in ${EASYBUILD_INSTALLPATH},"
66-
msg="${msg} allowing for --from-pr's that were added in this PR..."
67-
echo ${msg}
68-
eb_missing_out=$LOCAL_TMPDIR/eb_missing_with_from_pr.out
69-
${EB:-eb} --easystack ${tmp_easystack} --missing 2>&1 | tee ${eb_missing_out}
70-
exit_code_with_from_pr=${PIPESTATUS[0]}
71-
72-
# If now we succeeded, the reason must be that we originally stripped the --from-pr's
73-
if [ "$exit_code_with_from_pr" -eq 0 ]; then
74-
fail_msg="$fail_msg (are you sure all PRs referenced have been merged in EasyBuild?)"
75-
fi
76-
fi
7742

7843
check_exit_code ${exit_code} "${ok_msg}" "${fail_msg}"
7944

0 commit comments

Comments
 (0)