diff options
author | Martin Stockhammer <martin_s@apache.org> | 2019-11-17 21:16:39 +0100 |
---|---|---|
committer | Martin Stockhammer <martin_s@apache.org> | 2019-11-17 21:36:59 +0100 |
commit | aa36da078e3d7cb54fccf01e572d25cf03c8947d (patch) | |
tree | 7407202baf503a72409bbcfbe016de89459ad6d1 | |
parent | 7c42329da247d6634bc8a2658bdf96f54554b478 (diff) | |
download | archiva-aa36da078e3d7cb54fccf01e572d25cf03c8947d.tar.gz archiva-aa36da078e3d7cb54fccf01e572d25cf03c8947d.zip |
Adding flag for using local jenkins
-rw-r--r-- | Jenkinsfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index d53c04446..c8100e9d9 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}" } } } |