Skip to content

Commit fbb0078

Browse files
committed
Change return code to 1 when no files found in AUXILIARY_IMAGE_PATH.
1 parent 594895e commit fbb0078

File tree

1 file changed

+5
-3
lines changed
  • operator/src/main/resources/scripts

1 file changed

+5
-3
lines changed

operator/src/main/resources/scripts/utils.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,11 @@ function checkAuxiliaryImage() {
722722
rm -f ${AUXILIARY_IMAGE_PATH}/testaccess.tmp || return 1
723723

724724
# The container .out files embed their container name, the names will sort in the same order in which the containers ran
725-
out_files=$(set -o pipefail ; ls -1 $AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out > /dev/null 2>&1 | sort --version-sort) \
726-
|| (trace SEVERE "Auxiliary Image: Assertion failure. No files found in '$AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out" \
727-
&& return 1)
725+
out_files=$(ls -1 $AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out 2>/dev/null | sort --version-sort)
726+
if [ -z ${out_files} ]; then
727+
trace SEVERE "Auxiliary Image: Assertion failure. No files found in '$AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out'"
728+
return 1
729+
fi
728730
severe_found=false
729731
for out_file in $out_files; do
730732
if [ "$(grep -c SEVERE $out_file)" != "0" ]; then

0 commit comments

Comments
 (0)