You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2019/04/11 06:18:58 UTC
[directory-ldap-api] branch master updated: Attempt to stabilize
OSGi tests with Java 12
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new 71b7278 Attempt to stabilize OSGi tests with Java 12
71b7278 is described below
commit 71b7278861b6e95ef952e40cf075e375bbafe0b6
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Thu Apr 11 08:18:45 2019 +0200
Attempt to stabilize OSGi tests with Java 12
---
Jenkinsfile | 16 +++++++++++++---
integ-osgi/pom.xml | 9 +++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index afe2efd..6946efd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,11 +48,11 @@ pipeline {
}
}
stage ('Build and Test') {
- options {
- timeout(time: 2, unit: 'HOURS')
- }
parallel {
stage ('Linux Java 8') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
docker {
label 'ubuntu'
@@ -71,6 +71,10 @@ pipeline {
}
}
stage ('Linux Java 11') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ retry(1)
+ }
agent {
docker {
label 'ubuntu'
@@ -88,6 +92,9 @@ pipeline {
}
}
stage ('Linux Java 12') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
docker {
label 'ubuntu'
@@ -105,6 +112,9 @@ pipeline {
}
}
stage ('Windows Java 8') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
label 'Windows'
}
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index 926c2ec..a3ec4b4 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -163,6 +163,15 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <forkedProcessExitTimeoutInSeconds>1</forkedProcessExitTimeoutInSeconds>
+ <rerunFailingTestsCount>1</rerunFailingTestsCount>
+ </configuration>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>