[archiva] 02/03: Adding flag for using local jenkins

[martin_s]

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

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit aa36da078e3d7cb54fccf01e572d25cf03c8947d
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Sun Nov 17 21:16:39 2019 +0100

    Adding flag for using local jenkins
---
 Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d53c044..c8100e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,10 @@ publishers = [artifactsPublisher(disabled: false),
               junitPublisher(disabled: false, ignoreAttachments: false),
               pipelineGraphPublisher(disabled: 
false),mavenLinkerPublisher(disabled: false)]
 
-INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
+cmdLine = (env.NONAPACHEORG_RUN != 'y' && env.BRANCH_NAME == 'master') ? 
"clean deploy" : "clean install"
+
+
+        INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
 
 pipeline {
     agent {
@@ -103,7 +106,7 @@ pipeline {
                                 // -Dmaven.compiler.fork=true: Do compile in a 
separate forked process
                                 // -Dmaven.test.failure.ignore=true: Do not 
stop, if some tests fail
                                 // -Pci-build: Profile for CI-Server
-                                sh "mvn clean deploy -B -U -e -fae 
-Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
+                                sh "mvn ${cmdLine} -B -U -e -fae 
-Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
                             }
                 }
             }