You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/02/22 11:28:51 UTC

[incubator-plc4x] branch feature/Jenkinsfile_update updated: scripted steps need to be in script scope

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch feature/Jenkinsfile_update
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/feature/Jenkinsfile_update by this push:
     new d7bb9d4  scripted steps need to be in script scope
d7bb9d4 is described below

commit d7bb9d4c007d38b351333a862350c041fbad5355
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:28:48 2018 +0100

    scripted steps need to be in script scope
---
 Jenkinsfile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0738d62..dd6c81a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,16 +55,18 @@ pipeline {
 
         stage('Build') {
             steps {
-                // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
-                def mavenGoal = "install"
-                def mavenLocalRepo = ""
-                if (env.BRANCH_NAME == 'master') {
-                    mavenGoal = "deploy sonar:sonar"
-                } else {
-                    mavenLocalRepo = "-Dmaven.repo.local=.repository"
-                }
                 echo 'Building'
-                sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+                script {
+                    // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
+                    def mavenGoal = "install"
+                    def mavenLocalRepo = ""
+                    if (env.BRANCH_NAME == 'master') {
+                        mavenGoal = "deploy sonar:sonar"
+                    } else {
+                        mavenLocalRepo = "-Dmaven.repo.local=.repository"
+                    }
+                    sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+                }
             }
         }
 

-- 
To stop receiving notification emails like this one, please contact
sruehl@apache.org.