diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6982f6d2fd5..aea299ea3c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -533,7 +533,7 @@ jobs: - name: Run cluster tests run: | - ./mvnw test ${{ env.SUREFIRE_RETRY }} -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -pl testsuite/integration-arquillian/tests/base 2>&1 | misc/log/trimmer.sh + ./mvnw test ${{ env.SUREFIRE_RETRY }} -Pauth-server-cluster-quarkus,db-postgres -Dsession.cache.owners=2 -Dtest=**.cluster.** -pl testsuite/integration-arquillian/tests/base 2>&1 | misc/log/trimmer.sh - name: Upload JVM Heapdumps if: always() diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java b/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java index 1b363191069..af28909ef11 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java @@ -123,7 +123,7 @@ public final class Database { if ("dev-file".equalsIgnoreCase(alias)) { return addH2NonKeywords("jdbc:h2:file:${kc.home.dir:${kc.db-url-path:" + escapeReplacements(System.getProperty("user.home")) + "}}" + escapeReplacements(File.separator) + "${kc.data.dir:data}" + escapeReplacements(File.separator) + "h2" + escapeReplacements(File.separator) - + "keycloakdb${kc.db-url-properties:;;AUTO_SERVER=TRUE}"); + + "keycloakdb${kc.db-url-properties:}"); } return addH2NonKeywords("jdbc:h2:mem:keycloakdb${kc.db-url-properties:}"); } diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java index 9107e99b090..94df7eb84c0 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java @@ -292,7 +292,7 @@ public class ConfigurationTest { .toString() .replaceFirst(isWindows() ? "file:///" : "file://", ""); - assertEquals("jdbc:h2:file:" + userHomeUri + "data/h2/keycloakdb;;AUTO_SERVER=TRUE;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); + assertEquals("jdbc:h2:file:" + userHomeUri + "data/h2/keycloakdb;NON_KEYWORDS=VALUE", config.getConfigValue("quarkus.datasource.jdbc.url").getValue()); ConfigArgsConfigSource.setCliArgs("--db=dev-mem"); config = createConfig(); diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 50a1cae3fde..ade4e7ba8db 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -357,17 +357,17 @@ Make sure the `testsuite/integration-arquillian/servers/auth-server/quarkus` mod mvn -f testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml clean install \ -Pauth-server-cluster-quarkus -Run tests using the `auth-server-cluster-quarkus` profile: +Run tests using the `auth-server-cluster-quarkus` profile and with a database which is not H2: mvn -f testsuite/integration-arquillian/tests/base/pom.xml clean install \ - -Pauth-server-cluster-quarkus \ + -Pauth-server-cluster-quarkus,db-postgres \ -Dsession.cache.owners=2 \ -Dtest=AuthenticationSessionFailoverClusterTest Alternatively, you can perform both steps using the following command: mvn -f testsuite/integration-arquillian/pom.xml clean install \ - -Pauth-server-cluster-quarkus \ + -Pauth-server-cluster-quarkus,db-postgres \ -Dsession.cache.owners=2 \ -Dtest=AuthenticationSessionFailoverClusterTest