use a variable for maven tool and use same directory as now local repo is relative

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2018-04-20 17:48:08 +10:00
parent 06b04e9cda
commit b261c11920
1 changed files with 12 additions and 14 deletions

26
Jenkinsfile vendored
View File

@ -17,6 +17,7 @@ def getFullBuild(jdk, os) {
// System Dependent Locations // System Dependent Locations
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 localRepo = ".repository" // "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" def localRepo = ".repository" // "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}"
// Environment // Environment
@ -39,7 +40,7 @@ def getFullBuild(jdk, os) {
withEnv(mvnEnv) { withEnv(mvnEnv) {
timeout(time: 15, unit: 'MINUTES') { timeout(time: 15, unit: 'MINUTES') {
withMaven( withMaven(
maven: 'maven3', maven: mvnName,
jdk: "$jdk", jdk: "$jdk",
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
globalMavenSettingsConfig: 'oss-settings.xml', globalMavenSettingsConfig: 'oss-settings.xml',
@ -61,7 +62,7 @@ def getFullBuild(jdk, os) {
withEnv(mvnEnv) { withEnv(mvnEnv) {
timeout(time: 20, unit: 'MINUTES') { timeout(time: 20, unit: 'MINUTES') {
withMaven( withMaven(
maven: 'maven3.5', maven: mvnName,
jdk: "$jdk", jdk: "$jdk",
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
globalMavenSettingsConfig: 'oss-settings.xml', globalMavenSettingsConfig: 'oss-settings.xml',
@ -83,7 +84,7 @@ def getFullBuild(jdk, os) {
timeout(time: 90, unit: 'MINUTES') { timeout(time: 90, unit: 'MINUTES') {
// Run test phase / ignore test failures // Run test phase / ignore test failures
withMaven( withMaven(
maven: 'maven3.5', maven: mvnName,
jdk: "$jdk", jdk: "$jdk",
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
//options: [invokerPublisher(disabled: false)], //options: [invokerPublisher(disabled: false)],
@ -135,17 +136,14 @@ def getFullBuild(jdk, os) {
try try
{ {
stage ("Compact3 - ${jdk}") { stage ("Compact3 - ${jdk}") {
withEnv(mvnEnv) {
dir("aggregates/jetty-all-compact3") { withMaven(
withEnv(mvnEnv) { maven: mvnName,
withMaven( jdk: "$jdk",
maven: 'maven3.5', publisherStrategy: 'EXPLICIT',
jdk: "$jdk", globalMavenSettingsConfig: 'oss-settings.xml',
publisherStrategy: 'EXPLICIT', mavenLocalRepo: localRepo) {
globalMavenSettingsConfig: 'oss-settings.xml', sh "mvn -f aggregates/jetty-all-compact3 -V -B -Pcompact3 clean install -T5"
mavenLocalRepo: localRepo) {
sh "mvn -V -B -Pcompact3 clean install -T5"
}
} }
} }
} }