[KEYCLOAK-14378] Allow customization of debug settings for clustered …

…JBoss app servers in tests.
tsaarni · Sep 30, 2021 · ff07c48 · ff07c48
1 parent 2da0fb7
commit ff07c48
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/...p/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java b/...p/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
@@ -142,8 +142,8 @@ private void addHaNodeContainer(Node group, int number) {
                 System.getProperty("adapter.test.props", " ") +
                 System.getProperty("kie.maven.settings", " ")
         );
-        createChild("javaVmArguments", 
-                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
+        createChild("javaVmArguments",
+                System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
                 System.getProperty("app.server.memory.settings", "") + " " +
                 "-Djava.net.preferIPv4Stack=true" + " " +
                 System.getProperty("app.server.jvm.args.extra")

diff --git a/.../src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java b/.../src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java
@@ -139,8 +139,8 @@ private void addHaNodeContainer(Node group, int number) {
                 System.getProperty("adapter.test.props", " ") + " " +
                 System.getProperty("kie.maven.settings", " ")
         );
-        createChild("javaVmArguments", 
-                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
+        createChild("javaVmArguments",
+                System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
                 System.getProperty("app.server.memory.settings", "") + " " +
                 "-Djava.net.preferIPv4Stack=true"
         );

diff --git a/...g/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java b/...g/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java
@@ -139,8 +139,8 @@ private void addHaNodeContainer(Node group, int number) {
                 System.getProperty("adapter.test.props", " ") +
                 System.getProperty("kie.maven.settings", " ")
         );
-        createChild("javaVmArguments", 
-                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
+        createChild("javaVmArguments",
+                System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
                 System.getProperty("app.server.memory.settings", "") + " " +
                 "-Djava.net.preferIPv4Stack=true"
         );

diff --git a/...in/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java b/...in/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
@@ -140,8 +140,8 @@ private void addHaNodeContainer(Node group, int number) {
                 System.getProperty("adapter.test.props", " ") +
                 System.getProperty("kie.maven.settings", " ")
         );
-        createChild("javaVmArguments", 
-                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
+        createChild("javaVmArguments",
+                System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
                 System.getProperty("app.server.memory.settings", "") + " " +
                 "-Djava.net.preferIPv4Stack=true" + " " +
                 System.getProperty("app.server.jvm.args.extra")

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
@@ -114,6 +114,12 @@
         <app.server.debug.port>5006</app.server.debug.port>
         <app.server.debug.suspend>n</app.server.debug.suspend>
         <app.server.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.jboss.jvm.debug.args>
+        <app.server.1.debug.port>7301</app.server.1.debug.port>
+        <app.server.1.debug.suspend>n</app.server.1.debug.suspend>
+        <app.server.1.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.1.debug.suspend},address=localhost:${app.server.1.debug.port}</app.server.1.jboss.jvm.debug.args>
+        <app.server.2.debug.port>7302</app.server.2.debug.port>
+        <app.server.2.debug.suspend>n</app.server.2.debug.suspend>
+        <app.server.2.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.2.debug.suspend},address=localhost:${app.server.2.debug.port}</app.server.2.jboss.jvm.debug.args>
         <app.server.memory.Xms>64m</app.server.memory.Xms>
         <app.server.memory.Xmx>512m</app.server.memory.Xmx>
         <app.server.memory.settings>-Xms${app.server.memory.Xms} -Xmx${app.server.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}</app.server.memory.settings>
@@ -561,6 +567,8 @@
                             <app.server.truststore.password>${app.server.truststore.password}</app.server.truststore.password>
                             <app.server.keystore>${app.server.keystore}</app.server.keystore>
                             <app.server.keystore.password>${app.server.keystore.password}</app.server.keystore.password>
+                            <app.server.1.jboss.jvm.debug.args>${app.server.1.jboss.jvm.debug.args}</app.server.1.jboss.jvm.debug.args>
+                            <app.server.2.jboss.jvm.debug.args>${app.server.2.jboss.jvm.debug.args}</app.server.2.jboss.jvm.debug.args>
                             <app.server.jvm.args.extra>${app.server.jvm.args.extra}</app.server.jvm.args.extra>
                             <tomcat.javax.net.ssl.properties>${tomcat.javax.net.ssl.properties}</tomcat.javax.net.ssl.properties>