[archiva] branch master updated: Recombining build and deploy phase

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 3732f2e  Recombining build and deploy phase
3732f2e is described below

commit 3732f2e072260dae71325067a5402fb1306d7b0b
Author: Martin Stockhammer <ma...@ars.de>
AuthorDate: Wed May 2 17:25:00 2018 +0200

    Recombining build and deploy phase
    
    Getting errors when deploy is run in second call.
---
 Jenkinsfile | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9faa94a..2b07b49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,13 +48,15 @@ pipeline {
                                 // -Dmaven.compiler.fork=false: Do not 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 install -B -U -e -fae -Dmaven.test.failure.ignore=true -T2 -Dmaven.compiler.fork=false -Pci-build"
+                                sh "mvn clean deploy -B -U -e -fae -Dmaven.test.failure.ignore=true -T2 -Dmaven.compiler.fork=false -Pci-build"
                             }
                 }
             }
             post {
-                success {
+                always {
                     junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: '**/target/surefire-reports/TEST-*.xml'
+                }
+                success {
                     archiveArtifacts '**/target/*.war,**/target/*-bin.zip'
                 }
                 failure {
@@ -63,26 +65,6 @@ pipeline {
             }
         }
 
-        stage('Deploy') {
-            steps {
-                timeout(120) {
-                    withMaven(maven: buildMvn, jdk: buildJdk,
-                            mavenSettingsConfig: deploySettings,
-                            mavenLocalRepo: ".repository",
-                            options: [artifactsPublisher(disabled: true), junitPublisher(disabled: true, ignoreAttachments: false)]
-                    )
-                            {
-                                sh "mvn deploy -B -Dmaven.test.skip=true"
-                            }
-                }
-            }
-            post {
-                failure {
-                    notifyBuild("Deploy failure")
-                }
-            }
-        }
-
     }
     post {
         unstable {

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