test some Jenkinsfile changes (#2471)

* maven 3.5

* add surefire timeout to avoid build stuck
This commit is contained in:
Olivier Lamy 2018-04-25 19:29:21 +10:00 committed by GitHub
parent fbbf5d2d2d
commit d64d0348b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

5
Jenkinsfile vendored
View File

@ -18,7 +18,7 @@ def getFullBuild(jdk, os) {
def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation' def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation'
def jdktool = tool name: "$jdk", type: 'hudson.model.JDK' def jdktool = tool name: "$jdk", type: 'hudson.model.JDK'
def mvnName = 'maven3.5' def mvnName = 'maven3.5'
def localRepo = ".repository" // "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // ".repository" //
def settingsName = 'oss-settings.xml' def settingsName = 'oss-settings.xml'
// Environment // Environment
@ -90,8 +90,7 @@ def getFullBuild(jdk, os) {
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
globalMavenSettingsConfig: settingsName, globalMavenSettingsConfig: settingsName,
mavenLocalRepo: localRepo) { mavenLocalRepo: localRepo) {
// sh "mvn -V -B install -Dmaven.test.failure.ignore=true -Prun-its -e -Pmongodb -T3"
sh "mvn -V -B install -Dmaven.test.failure.ignore=true -Prun-its -T2 -e -Pmongodb"
} }
// withMaven doesn't label.. // withMaven doesn't label..
// Report failures in the jenkins UI // Report failures in the jenkins UI

View File

@ -613,6 +613,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${surefireVersion}</version> <version>${surefireVersion}</version>
<configuration> <configuration>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine> <argLine>@{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
<failIfNoTests>false</failIfNoTests> <failIfNoTests>false</failIfNoTests>
<forkCount>1</forkCount> <forkCount>1</forkCount>