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

[dlaboss]

- 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/bd059c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/bd059c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/bd059c50

Branch: refs/heads/develop
Commit: bd059c504727735201a82ec1182c47254cdffaeb
Parents: 9423f7a
Author: Christofer Dutz <christofer.d...@c-ware.de>
Authored: Wed Nov 1 13:40:38 2017 +0100
Committer: Christofer Dutz <christofer.d...@c-ware.de>
Committed: Wed Nov 1 13:40:38 2017 +0100

----------------------------------------------------------------------
 Jenkinsfile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bd059c50/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 63407d4..6bd1fa1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,9 +50,20 @@ node('ubuntu') {
             checkout scm
         }
 
+        stage ('Clean') {
+            echo 'Cleaning Edgent'
+            sh "${mvnHome}/bin/mvn ${mavenLocalRepo} 
-Pplatform-android,platform-java7,distribution clean"
+        }
+
         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"
+            sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} 
-Pplatform-android,platform-java7,distribution,toolchain 
-Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true ${mavenGoal} sonar:sonar"
+        }
+
+        stage ('Build Site') {
+            echo 'Building Site'
+            sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
+
         }
 
         stage ('Build Samples') {
@@ -65,21 +76,15 @@ node('ubuntu') {
 
         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"
+            sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} 
${mavenLocalRepo} clean package; ./app-run.sh"
+            sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} 
${mavenLocalRepo} -Pplatform-java7 clean package; ./app-run.sh"
+            sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} 
${mavenLocalRepo} -Pplatform-android clean package; ./app-run.sh"
         }
 
         stage ('Verify get-engent-jars') {
             echo 'Verifying get-edgent-jars'
             sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
         }
-
-        stage ('Stage Site') {
-            echo 'Staging Site'
-            sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} 
-Pplatform-android,platform-java7,distribution,toolchain 
-Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true site:stage"
-        }
-
     }