From 79178b5a233b1930071bb1dda2eb1fd1125d934d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Wed, 19 Apr 2023 17:42:34 +0200 Subject: [PATCH] Use WildFly as the default app server --- .github/actions/build-keycloak/action.yml | 2 +- .../integration-arquillian/HOW-TO-RUN.md | 1 + testsuite/integration-arquillian/pom.xml | 2 +- .../servers/app-server/jboss/pom.xml | 1 + .../integration-arquillian/tests/base/pom.xml | 24 +++++++++++++++++-- .../arquillian/AppServerTestEnricher.java | 2 +- .../containers/RegistryCreator.java | 2 +- .../tests/other/pom.xml | 4 ++++ 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-keycloak/action.yml b/.github/actions/build-keycloak/action.yml index 25f1e1700c..f3a0032c81 100644 --- a/.github/actions/build-keycloak/action.yml +++ b/.github/actions/build-keycloak/action.yml @@ -49,7 +49,7 @@ runs: # By using "dependency:resolve", it will download all dependencies used in later stages for running the tests run: | MVN_HTTP_CONFIG="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120" - ./mvnw install dependency:resolve -nsu -B -e -DskipTests -DskipExamples $MVN_HTTP_CONFIG -Papp-server-wildfly + ./mvnw install dependency:resolve -nsu -B -e -DskipTests -DskipExamples $MVN_HTTP_CONFIG - id: compress-keycloak-maven-repository name: Compress Keycloak Maven artifacts diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index e06fc2dabf..1a25215a45 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -141,6 +141,7 @@ and add packages manually. ### Undertow mvn -f testsuite/integration-arquillian/tests/base/pom.xml \ -Dtest=org.keycloak.testsuite.adapter.**.*Test + -Papp-server-undertow ### Jetty diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 59ecee832e..752d8e2a49 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -37,7 +37,7 @@ ${project.build.directory}/containers ${java.home} ${java.home} - undertow + wildfly ${java.home} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index 7ee6178a08..ec2e37e874 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -794,6 +794,7 @@ app-server-wildfly + true app.server wildfly diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 3972eb8c17..0e76802d57 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -141,9 +141,8 @@ org.keycloak.testsuite - integration-arquillian-servers-app-server-undertow + integration-arquillian-util ${project.version} - runtime org.keycloak.testsuite @@ -501,9 +500,30 @@ + + app-server-undertow + + + app.server + undertow + + + + undertow + + + + org.keycloak.testsuite + integration-arquillian-servers-app-server-undertow + ${project.version} + runtime + + + app-server-wildfly + true app.server wildfly diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java index 6328de4407..1815015c89 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java @@ -71,7 +71,7 @@ public class AppServerTestEnricher { private static final Logger log = Logger.getLogger(AppServerTestEnricher.class); - public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "undertow"); + public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "wildfly"); public static final boolean APP_SERVER_SSL_REQUIRED = Boolean.parseBoolean(System.getProperty("app.server.ssl.required", "false")); @Inject private Instance containerConrollerInstance; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java index c4e146dc29..29b8e411d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java @@ -110,7 +110,7 @@ public class RegistryCreator { private void addAppServerContainers(List containerDefs, List groupDefs) { Node parent = ((NodeDescriptor)containerDefs.get(0)).getRootNode(); - String appServerName = System.getProperty("app.server", "undertow"); + String appServerName = System.getProperty("app.server", "wildfly"); List containers = AppServerContainerService.getInstance().getContainers(appServerName); if (containers == null) { diff --git a/testsuite/integration-arquillian/tests/other/pom.xml b/testsuite/integration-arquillian/tests/other/pom.xml index 866d6bf9d6..4e8f7f9a10 100644 --- a/testsuite/integration-arquillian/tests/other/pom.xml +++ b/testsuite/integration-arquillian/tests/other/pom.xml @@ -36,6 +36,10 @@ Test modules that depend on the Base TestSuite. This POM contains common configuration for submodules. + + undertow + +