Commit eb144344 authored by Peter Centgraf's avatar Peter Centgraf

TRIVIAL Cleanup test settings to enable parallel testing

parent a2a37b35
......@@ -14,4 +14,4 @@
* limitations under the License.
*/
cmsPipeline()
\ No newline at end of file
cmsPipeline( mavenForkCount: '4' )
......@@ -114,9 +114,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<!--<forkMode>once</forkMode>-->
<systemPropertyVariables>
<repo.path>${repo.path}</repo.path>
<!--<repo.path>${repo.path}</repo.path>-->
<repo.config>${repo.config}</repo.config>
<org.onehippo.repository.test.keepserver>true</org.onehippo.repository.test.keepserver>
</systemPropertyVariables>
......
......@@ -120,9 +120,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<!--<forkMode>once</forkMode>-->
<systemPropertyVariables>
<repo.path>${repo.path}</repo.path>
<!--<repo.path>${repo.path}</repo.path>-->
<repo.config>${repo.config}</repo.config>
<org.onehippo.repository.test.keepserver>true</org.onehippo.repository.test.keepserver>
</systemPropertyVariables>
......
......@@ -136,7 +136,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<workingDirectory>${project.build.directory}</workingDirectory>
<systemPropertyVariables>
<org.onehippo.repository.test.keepserver>true</org.onehippo.repository.test.keepserver>
......
......@@ -29,14 +29,12 @@
<packaging>jar</packaging>
<properties>
<repo.path>${project.build.directory}/storage</repo.path>
<repo.config />
<surefire.forkmode>once</surefire.forkmode>
<db.host/>
<db.port/>
<db.name/>
<db.user/>
<db.password/>
<db.host />
<db.port />
<db.name />
<db.user />
<db.password />
</properties>
<dependencies>
......@@ -149,9 +147,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>${surefire.forkmode}</forkMode>
<systemPropertyVariables>
<repo.path>${repo.path}</repo.path>
<repo.config>${repo.config}</repo.config>
<org.onehippo.repository.test.keepserver>true</org.onehippo.repository.test.keepserver>
<db.host>${db.host}</db.host>
......
......@@ -119,7 +119,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<!-- Tests don't play well with repository that isn't cleaned up by a full JVM restart -->
<reuseForks>false</reuseForks>
<workingDirectory>${project.build.directory}</workingDirectory>
</configuration>
</plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment