libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-11808 update testsuite to use current jdbc driver version for migration testing

Browse source
This commit is contained in:
vramik 2020-03-03 16:51:20 +01:00 committed by Pavel Drozd
parent 99aba33980
commit 83461d033b
3 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/HOW-TO-RUN.md
View file

@ -381,7 +381,7 @@ Run the test (Update according to your DB connection, versions etc):
-Dprevious.product.unpacked.folder.name=keycloak-$OLD_KEYCLOAK_VERSION \
-Dmigration.import.file.name=migration-realm-$OLD_KEYCLOAK_VERSION.json \
-Dauth.server.ssl.required=false \
-Djdbc.mvn.version.legacy=2.2.4
-Djdbc.mvn.version=2.2.4
For the available versions of old keycloak server, you can take a look to [this directory](tests/base/src/test/resources/migration-test) .

2
testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml
View file

@ -226,7 +226,7 @@
</resources>
<filterset>
<filter token="DATABASE" value="${jdbc.mvn.artifactId}"/>
<filter token="DRIVER_VERSION" value="${jdbc.mvn.version.legacy}"/>
<filter token="DRIVER_VERSION" value="${jdbc.mvn.version}"/>
<filter token="DRIVER_TMP_DIR" value="${jdbc.driver.tmp.dir}"/>
<filter token="JDBC_URL" value="${keycloak.connectionsJpa.url}"/>
<filter token="USER" value="${keycloak.connectionsJpa.user}"/>

42
testsuite/integration-arquillian/servers/migration/pom.xml
View file

@ -51,25 +51,37 @@
<rules>
<requireProperty>
<property>migrated.auth.server.version</property>
<property>jdbc.mvn.version.legacy</property>
<message>Property "migrated.auth.server.version" is required for this build. It should be one of supported versions. See base/src/test/resources/migration-test/</message>
</requireProperty>
<requireProperty>
<property>keycloak.connectionsJpa.user</property>
<property>keycloak.connectionsJpa.url</property>
</requireProperty>
<requireProperty>
<property>jdbc.mvn.groupId</property>
<regex>((?!com.h2database).)*</regex>
<regexMessage>jdbc.mvn.groupId property is not set correctly: ${jdbc.mvn.groupId}. Profile jpa is not supported for default h2 values!</regexMessage>
</requireProperty>
<requireProperty>
<property>jdbc.mvn.artifactId</property>
<regex>((?!h2).)*</regex>
<regexMessage>jdbc.mvn.artifactId property is not set correctly: ${jdbc.mvn.artifactId}. Profile jpa is not supported for default h2 values!</regexMessage>
</requireProperty>
<requireProperty>
<property>keycloak.connectionsJpa.password</property>
<regex>^(?!\s*$).+</regex>
<regexMessage>keycloak.connectionsJpa.password property cannot be empty string!</regexMessage>
<regexMessage>"keycloak.connectionsJpa.password" property cannot be empty string!</regexMessage>
</requireProperty>
<requireProperty>
<property>keycloak.connectionsJpa.url</property>
<regex>((?!h2).)*</regex>
<regexMessage>"keycloak.connectionsJpa.url" property is not set correctly: "${keycloak.connectionsJpa.url}". Migration is not supported for default h2 values!</regexMessage>
</requireProperty>
<requireProperty>
<property>jdbc.mvn.groupId</property>
<regex>((?!com.h2database).)*</regex>
<regexMessage>"jdbc.mvn.groupId" property is not set correctly: "${jdbc.mvn.groupId}". Migration is not supported for default h2 values!</regexMessage>
</requireProperty>
<requireProperty>
<property>jdbc.mvn.artifactId</property>
<regex>((?!h2).)*</regex>
<regexMessage>"jdbc.mvn.artifactId" property is not set correctly: "${jdbc.mvn.artifactId}". Migration is not supported for default h2 values!</regexMessage>
</requireProperty>
<requireProperty>
<property>jdbc.mvn.version</property>
<regex>((?!${h2.version}).)*</regex>
<regexMessage>"jdbc.mvn.version" property is not set correctly: "${jdbc.mvn.version}". Migration is not supported for default h2 values!</regexMessage>
</requireProperty>
</rules>
</configuration>
</execution>
@ -108,7 +120,7 @@
<artifactItem>
<groupId>${jdbc.mvn.groupId}</groupId>
<artifactId>${jdbc.mvn.artifactId}</artifactId>
<version>${jdbc.mvn.version.legacy}</version>
<version>${jdbc.mvn.version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
@ -136,7 +148,7 @@
<!-- defined via -Dproperty=value when executing maven command -->
<property name="jdbc.driver.tmp.dir">${jdbc.driver.tmp.dir}</property>
<property name="jdbc.mvn.artifactId">${jdbc.mvn.artifactId}</property>
<property name="jdbc.mvn.version.legacy">${jdbc.mvn.version.legacy}</property>
<property name="jdbc.mvn.version">${jdbc.mvn.version}</property>
<property name="keycloak.connectionsJpa.url">${keycloak.connectionsJpa.url}</property>
<property name="keycloak.connectionsJpa.user">${keycloak.connectionsJpa.user}</property>
<property name="keycloak.connectionsJpa.password">${keycloak.connectionsJpa.password}</property>