From d70e4740fcde822588891266f7f8723702313e80 Mon Sep 17 00:00:00 2001
From: vmuzikar <vmuzikar@redhat.com>
Date: Fri, 23 Feb 2018 12:46:48 +0100
Subject: [PATCH] KEYCLOAK-6693 Support external truststore in testsuite

---
 .../auth-server/jboss/common/keycloak-server-subsystem.xsl    | 4 ++--
 .../tests/base/src/test/resources/arquillian.xml              | 2 ++
 testsuite/integration-arquillian/tests/pom.xml                | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl b/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl
index 276f389517..a1433b18a6 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl
@@ -28,8 +28,8 @@
         <spi name="truststore">
             <provider name="file" enabled="true">
                 <properties>
-                    <property name="file" value="${{jboss.home.dir}}/standalone/configuration/keycloak.truststore"/>
-                    <property name="password" value="secret"/>
+                    <property name="file" value="${{auth.server.truststore}}"/>
+                    <property name="password" value="${{auth.server.truststore.password}}"/>
                     <property name="hostname-verification-policy" value="WILDCARD"/>
                     <property name="disabled" value="false"/>
                 </properties>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index d81d5cc9d1..cad5920b57 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -100,6 +100,8 @@
                 ${auth.server.profile}
                 ${auth.server.feature}
                 ${kie.maven.settings}
+                -Dauth.server.truststore=${auth.server.truststore}
+                -Dauth.server.truststore.password=${auth.server.truststore.password}
             </property>
             <property name="javaVmArguments">
                 ${auth.server.jboss.jvm.debug.args}
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 1e296445cf..04a95833e5 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -62,6 +62,8 @@
         <auth.server.memory.settings>-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</auth.server.memory.settings>
         <auth.server.config.property.name>serverConfig</auth.server.config.property.name>
         <auth.server.adapter.impl.class>org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</auth.server.adapter.impl.class>
+        <auth.server.truststore>&#36;{jboss.home.dir}/standalone/configuration/keycloak.truststore</auth.server.truststore>
+        <auth.server.truststore.password>secret</auth.server.truststore.password>
 
         <auth.server.jboss.artifactId>integration-arquillian-servers-auth-server-${auth.server}</auth.server.jboss.artifactId>
         <auth.server.jboss.skip.unpack>${auth.server.undertow}</auth.server.jboss.skip.unpack>
@@ -252,6 +254,8 @@
                             <auth.server.config.property.value>${auth.server.config.property.value}</auth.server.config.property.value>
                             <auth.server.adapter.impl.class>${auth.server.adapter.impl.class}</auth.server.adapter.impl.class>
                             <auth.server.jboss.jvm.debug.args>${auth.server.jboss.jvm.debug.args}</auth.server.jboss.jvm.debug.args>
+                            <auth.server.truststore>${auth.server.truststore}</auth.server.truststore>
+                            <auth.server.truststore.password>${auth.server.truststore.password}</auth.server.truststore.password>
 
                             <auth.server.profile>${auth.server.profile}</auth.server.profile>
                             <auth.server.feature>${auth.server.feature}</auth.server.feature>