Fixing report handling and trigger from master build

2 files changed, 19 insertions, 19 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 29cf71f45..e3ffc011b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,7 @@ LABEL = 'ubuntu'
 buildJdk = 'JDK 1.8 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
+INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
 
 pipeline {
     agent {
@@ -54,7 +55,7 @@ pipeline {
             }
         }
 
-        stage('Build') {
+        stage('BuildAndDeploy') {
             steps {
                 timeout(120) {
                     withMaven(maven: buildMvn, jdk: buildJdk,
@@ -105,6 +106,12 @@ pipeline {
         }
 
     }
+
+    stage('IntegrationTest') {
+        steps {
+            build(job:"${INTEGRATION_PIPELINE}/archiva/${env.BRANCH_NAME}", propagate:false, quietPeriod:10)
+        }
+    }
     post {
         unstable {
             notifyBuild("Unstable Build (${currentBuild.currentResult})")
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index fcfef1973..751213173 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -86,15 +86,7 @@ pipeline {
             }
             post {
                 always {
-                    junit testResults: '**/target/surefire-reports/TEST-*.xml'
-                }
-                success {
-                    script {
-                        def previousResult = currentBuild.previousBuild?.result
-                        if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) {
-                            notifyBuild("Fixed: ${currentBuild.currentResult}")
-                        }
-                    }
+                    junit testResults: '**/target/failsafe-reports/TEST-*.xml'
                 }
                 failure {
                     notifyBuild("Build / Test failure (${currentBuild.currentResult})")
@@ -144,15 +136,7 @@ pipeline {
             post {
                 always {
                     sh "src/ci/scripts/container_webtest.sh stop"
-                    junit testResults: '**/target/surefire-reports/TEST-*.xml'
-                }
-                success {
-                    script {
-                        def previousResult = currentBuild.previousBuild?.result
-                        if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) {
-                            notifyBuild("Fixed: ${currentBuild.currentResult}")
-                        }
-                    }
+                    junit testResults: '**/target/failsafe-reports/TEST-*.xml'
                 }
                 failure {
                     notifyBuild("Build / Test failure (${currentBuild.currentResult})")
@@ -168,6 +152,15 @@ pipeline {
         always {
             cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
         }
+        success {
+            script {
+                def previousResult = currentBuild.previousBuild?.result
+                if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) {
+                    notifyBuild("Fixed: ${currentBuild.currentResult}")
+                }
+            }
+        }
+
     }
 }