From c2682157fb7b5138d7598a7d44901654fb114cde Mon Sep 17 00:00:00 2001 From: Miquel Simon Date: Fri, 6 Jan 2023 08:55:09 +0100 Subject: [PATCH] Added MS SQL Server to Legacy Store IT. (#16121) * Added MS SQL Server to Legacy Store IT. * Update testsuite/integration-arquillian/pom.xml Co-authored-by: Stian Thorgersen Co-authored-by: Stian Thorgersen --- .github/workflows/ci.yml | 2 +- pom.xml | 2 +- testsuite/integration-arquillian/pom.xml | 2 +- .../main/java/org/keycloak/testsuite/model/StoreProvider.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 521807af40..b94f2bfd6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -271,7 +271,7 @@ jobs: timeout-minutes: 45 strategy: matrix: - db: [postgres, mysql, oracle] # 'mariadb' is not always shutting down, 'mssql' container not available yet + db: [postgres, mysql, oracle, mssql] # 'mariadb' is not always shutting down fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/pom.xml b/pom.xml index 877d69a03e..a4ccd4d2fb 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 42.5.1 10.3.27 2.7.2 - 2019-CU10-ubuntu-20.04 + 2019-latest 9.2.0.jre8 21.5.0.0 diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index bbe6828fde..1e7bb6cd01 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -565,7 +565,7 @@ keycloak sa vEry5tron9Pwd - jdbc:sqlserver://${auth.server.db.host}:${docker.database.port};databaseName=${keycloak.connectionsJpa.database} + jdbc:sqlserver://${auth.server.db.host}:${docker.database.port};databaseName=${keycloak.connectionsJpa.database};integratedSecurity=false;encrypt=false;trustServerCertificate=true;sendStringParametersAsUnicode=false; ${keycloak.connectionsJpa.url} ${keycloak.connectionsJpa.user} diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java index 29faf419f5..09107e681c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java @@ -59,6 +59,9 @@ public enum StoreProvider { commands.add("--db-url='" + System.getProperty("keycloak.connectionsJpa.url") + "'"); commands.add("--db-username=" + System.getProperty("keycloak.connectionsJpa.user")); commands.add("--db-password=" + System.getProperty("keycloak.connectionsJpa.password")); + if ("mssql".equals(getDbVendor().orElse(null))){ + commands.add("--transaction-xa-enabled=false"); + } } }, DEFAULT("default") {