From 10219c1157555c7bec8d21aa144f6b39fcf05c13 Mon Sep 17 00:00:00 2001 From: mhajas Date: Fri, 8 Dec 2017 13:32:44 +0100 Subject: [PATCH] KEYCLOAK-6005 Fail build when adapters installation fails --- .../app-server/jboss/common/install-adapters.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.sh b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.sh index 4a749faadb..7a6e87775e 100755 --- a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.sh +++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.sh @@ -23,30 +23,33 @@ do echo "Server is running. Installing adapter." ./jboss-cli.sh -c --file="adapter-install.cli" + RESULT=$? + echo "Return code of adapter-install:"${RESULT} - if [ "$ELYTRON_SUPPORTED" = true ]; then + if [ "$ELYTRON_SUPPORTED" = true ] && [ ${RESULT} -eq 0 ]; then echo "Installing elytron adapter." ./jboss-cli.sh -c --file="adapter-elytron-install.cli" + RESULT=$? else ./jboss-cli.sh -c --file="$CLI_PATH/remove-elytron-subsystem.cli" fi - if [ $? -ne 0 ]; then RESULT=1; fi - - if [ "$SAML_SUPPORTED" = true ]; then + if [ "$SAML_SUPPORTED" = true ] && [ ${RESULT} -eq 0 ]; then ./jboss-cli.sh -c --file="adapter-install-saml.cli" + RESULT=$? + echo "Return code of saml adapter-install:"$RESULT - if [ "$ELYTRON_SUPPORTED" = true ]; then + if [ "$ELYTRON_SUPPORTED" = true ] && [ ${RESULT} -eq 0 ]; then ./jboss-cli.sh -c --file="adapter-elytron-install-saml.cli" + RESULT=$? fi - - if [ $? -ne 0 ]; then RESULT=1; fi fi ./jboss-cli.sh -c --command=":shutdown" rm -rf $JBOSS_HOME/standalone/data rm -rf $JBOSS_HOME/standalone/log + echo "Exiting with return code: "$RESULT exit $RESULT fi echo "Server is not running."