From 0e470d75e9dfcca74238d9a9108d6771e233f335 Mon Sep 17 00:00:00 2001 From: Pavel Drozd Date: Tue, 19 Jul 2016 14:22:49 +0200 Subject: [PATCH] KEYCLOAK-3336 Arquillian testuite: Added possibility to install server patch --- .../jboss/common/install-patch.bat | 7 ++++ .../auth-server/jboss/common/install-patch.sh | 17 ++++++++ .../servers/auth-server/jboss/pom.xml | 41 ++++++++++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat create mode 100755 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat new file mode 100644 index 0000000000..d3a5cc4f4b --- /dev/null +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat @@ -0,0 +1,7 @@ +set NOPAUSE=true + +call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %PATCH_ZIP%" + +if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL% +exit /b %ERROR% + diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh new file mode 100755 index 0000000000..4a44294d03 --- /dev/null +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh @@ -0,0 +1,17 @@ +#!/bin/bash +echo "JBOSS_HOME=$JBOSS_HOME" + +if [ ! -d "$JBOSS_HOME/bin" ] ; then + >&2 echo "JBOSS_HOME/bin doesn't exist" + exit 1 +fi + +cd $JBOSS_HOME/bin + +RESULT=0 +./jboss-cli.sh --command="patch apply $PATCH_ZIP" +if [ $? -ne 0 ]; then RESULT=1; fi + exit $RESULT +fi + +exit 1 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml index bf6b3e0bc2..00c9fd3f74 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml @@ -292,6 +292,10 @@ + + org.codehaus.mojo + exec-maven-plugin + maven-assembly-plugin @@ -587,7 +591,42 @@ - + + auth-server-apply-patch + + + auth.server.patch.zip + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + install-patch + process-resources + + exec + + + + + ${common.resources}/install-patch.${script.suffix} + ${auth.server.home}/bin + + ${auth.server.java.home} + ${auth.server.home} + ${auth.server.patch.zip} + + + + + + + auth-server-cluster