You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/02 03:21:51 UTC

[40/50] [abbrv] incubator-edgent git commit: - Give the multiple steps another try

- Give the multiple steps another try


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d244cc72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d244cc72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d244cc72

Branch: refs/heads/develop
Commit: d244cc720d06ff1d39c31973d3f26f49764b123c
Parents: 2977261
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 15:43:16 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 15:43:16 2017 +0100

----------------------------------------------------------------------
 Jenkinsfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d244cc72/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index aef183c..852c792 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,13 +29,15 @@ node('ubuntu') {
     env.JAVA_HOME="${tool 'JDK 1.8 (latest)'}"
     env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
 
+    def workspace = pwd()
+
     // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
     def mavenGoal = "install"
     def mavenLocalRepo = ""
     if(env.BRANCH_NAME == 'develop') {
         mavenGoal = "deploy"
     } else {
-        mavenLocalRepo = "-Dmaven.repo.local=.repository"
+        mavenLocalRepo = "-Dmaven.repo.local=${workspace)/.repository"
     }
     def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
 
@@ -53,24 +55,24 @@ node('ubuntu') {
         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"
-/*        }
+        }
 
-        stage ('Build Samples') {*/
+        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"
-/*        }
+        }
 
-        stage ('Build Templates') {*/
+        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"
-/*        }
+        }
 
-        stage ('Verify get-engent-jars') {*/
+        stage ('Verify get-engent-jars') {
             echo 'Verifying get-edgent-jars'
             sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
         }