Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containers/automation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6a52ddfd0cf5ee9aeea49db393897d63f8dbb93
Choose a base ref
..
head repository: containers/automation
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de236cdc47c97e6c94e2d42caf17eed2b105698a
Choose a head ref
Showing with 4 additions and 6 deletions.
  1. +3 −5 build-push/bin/build-push.sh
  2. +1 −1 build-push/test/testbin-build-push.sh
8 changes: 3 additions & 5 deletions build-push/bin/build-push.sh
View file
Original file line number Diff line number Diff line change
@@ -20,12 +20,10 @@ fi
if [[ ! -r "$AUTOMATION_LIB_PATH/common_lib.sh" ]]; then
(
echo "ERROR: Expecting \$AUTOMATION_LIB_PATH to contain the installation"
echo " directory path for the common automation tooling. Normally"
echo " this is done by sourcing & exporting the contents of"
echo " /etc/automation_environment (placed by the installer)."
echo " Please refer to the README.md for more information."
echo " directory path for the common automation tooling."
echo " Please refer to the README.md for installation instructions."
) > /dev/stderr
exit 1
exit 2 # Verified by tests
fi

source $AUTOMATION_LIB_PATH/common_lib.sh
2 changes: 1 addition & 1 deletion build-push/test/testbin-build-push.sh
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ TEST_CONTEXT="$TEST_SOURCE_DIRPATH/test_context"
EMPTY_CONTEXT=$(mktemp -d -p '' .tmp_$(basename ${BASH_SOURCE[0]})_XXXX)

test_cmd "Verify error when automation library not found" \
1 'ERROR: Expecting \$AUTOMATION_LIB_PATH to be set' \
2 'ERROR: Expecting \$AUTOMATION_LIB_PATH' \
bash -c "AUTOMATION_LIB_PATH='' RUNTIME=/bin/true $SUBJ_FILEPATH 2>&1"

export AUTOMATION_LIB_PATH="$TEST_SOURCE_DIRPATH/../../common/lib"