Repository: maven
Updated Branches:
  refs/heads/embedded-ITs a22dacb52 -> 11efda695 (forced update)


trying to make Jenkinsfile easier to understand

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/22c4ecae
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/22c4ecae
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/22c4ecae

Branch: refs/heads/embedded-ITs
Commit: 22c4ecae58586c702055af814088a2841363f789
Parents: f0535a4
Author: Hervé Boutemy <hbout...@apache.org>
Authored: Fri Mar 24 03:25:17 2017 +0100
Committer: Hervé Boutemy <hbout...@apache.org>
Committed: Fri Mar 24 03:33:47 2017 +0100

----------------------------------------------------------------------
 Jenkinsfile | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/22c4ecae/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 2ac2644..5b47666 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,24 +22,32 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: 
'5', numToKeepStr: e
 def tests
 
 try {
+
 node('ubuntu') {
-    stage 'Checkout'
-    def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-    echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-    def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
-    echo "Running build and unit tests with Java $JAVA7_HOME"
     dir('build') {
-        checkout scm
-        def WORK_DIR=pwd()
-        stage 'Build / Unit Test'
-        withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-            sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+        stage('Checkout') {
+            checkout scm
         }
-        dir ('apache-maven/target') {
-            sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
-            stash includes: 'apache-maven-dist.zip', name: 'dist'
+
+        def WORK_DIR=pwd()
+
+        stage('Build / Unit Test') {
+            def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+            echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+            def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+            echo "Running build and unit tests with Java $JAVA7_HOME"
+
+            
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+                sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+            }
+
+            dir ('apache-maven/target') {
+                sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
+                stash includes: 'apache-maven-dist.zip', name: 'dist'
+            }
+            junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
         }
-        junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+
         tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, 
includes: '*', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], 
targets: [BRANCH_NAME, 'master']
     }
 }
@@ -140,6 +148,7 @@ parallel linuxJava7:{
             }
         }
     }
+
 } finally {
     node('ubuntu') {
         emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "${env.JOB_NAME} - build 
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 
'notificati...@maven.apache.org'

Reply via email to