commit 9423f7a9233283bf45b6a77d2e87b266e5732bf6
author Dale LaBossiere <dlaboss@us.ibm.com> Tue Oct 31 12:59:49 2017 -0400
committer Dale LaBossiere <dlaboss@us.ibm.com> Tue Oct 31 12:59:49 2017 -0400
tree c3a3a2787d906a55d8e1624d526208af8cc57ab7
parent 4e7f32eca5d44100f7102ae2fccd966424c69829
parent ba5d99e4794b177510ce942089f4c2aac461ae29

merge in origin/feature/maven

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 6fa4b55..63407d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@
     if(env.BRANCH_NAME == 'develop') {
         mavenGoal = "deploy"
     } else {
-        mavenLocalRepo = "-Dmaven.repo.local=.repository"
+        mavenLocalRepo = "-Dmaven.repo.local=${env.WORKSPACE}/.repository"
     }
     def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
 
@@ -50,22 +50,28 @@
             checkout scm
         }
 
-        stage ('Build') {
-            echo 'Building'
+        stage ('Build Edgent') {
+            echo 'Building Edgent'
             sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
+        }
 
-            echo 'Verify samples build, etc'
+        stage ('Build Samples') {
+            echo 'Building samples'
             sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package"
             sh "cd samples/topology; ./run-sample.sh HelloEdgent"
             sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package"
             sh "cd samples/topology; ./run-sample.sh HelloEdgent"
-            
-            echo 'Verify app template builds, etc'
+        }
+
+        stage ('Build Templates') {
+            echo 'Building templates'
             sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
             sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
             sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
-            
-            echo 'Verify get-edgent-jars'
+        }
+
+        stage ('Verify get-engent-jars') {
+            echo 'Verifying get-edgent-jars'
             sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
         }