Skip to content

Fix missing error output from WDT compareModel #2351

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
merged 4 commits into from
May 4, 2021
Merged

Fix missing error output from WDT compareModel #2351

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef5fb81
compareModel.sh does not generate compare_model_stdout if there is a …
jshum2479 May 3, 2021
c2d251f
use stdout for readibility
jshum2479 May 3, 2021
fc0caee
Update modelInImage.sh
May 3, 2021
16fb25b
remove space
jshum2479 May 4, 2021
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
5 changes: 2 additions & 3 deletions operator/src/main/resources/scripts/modelInImage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,12 +608,11 @@ function diff_model() {
export __WLSDEPLOY_STORE_MODEL__=1
# $1 - new model, $2 original model

# no need to redirect output, -output_dir for compareModel will generate the output file
${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 > /dev/null 2>&1
${WDT_BINDIR}/compareModel.sh -oracle_home ${ORACLE_HOME} -output_dir /tmp $1 $2 > ${WDT_OUTPUT} 2>&1
ret=$?
if [ $ret -ne 0 ]; then
trace SEVERE "WDT Compare Model failed:"
cat /tmp/compare_model_stdout
cat ${WDT_OUTPUT}
exitOrLoop
fi

Expand Down