From 01423b24ba403976cd6a5649b497530517ef0bec Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 6 May 2018 18:59:17 +0200
Subject: [PATCH] Jenkinsfile cleanup

---
 Jenkinsfile       | 14 ++++++--------
 Jenkinsfile-itest | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c13ad50d8..daf562120 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@
  * Only the war and zip artifacts are archived in the jenkins build archive.
  */
 LABEL = 'ubuntu'
-buildJdk = 'JDK 1.8 (latest)'
+buildJdk = 'JDK 1.7 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
 INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
@@ -50,7 +50,7 @@ pipeline {
             }
             post {
                 failure {
-                    notifyBuild("Checkout failure (${currentBuild.currentResult})")
+                    notifyBuild("Checkout failure")
                 }
             }
         }
@@ -68,8 +68,6 @@ pipeline {
                                       openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
                     )
                             {
-                                sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
-                                sh "./src/ci/scripts/prepareWorkspace.sh"
                                 // Needs a lot of time to reload the repository files, try without cleanup
                                 // Not sure, but maybe
                                 // sh "rm -rf .repository"
@@ -82,7 +80,7 @@ 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 deploy -B -U -e -fae -Dmaven.test.failure.ignore=true -T2 -Dmaven.compiler.fork=false -Pci-build"
+                                sh "mvn clean deploy -B -U -e -fae -T2 -Dmaven.compiler.fork=true -Pci-build"
                             }
                 }
             }
@@ -95,12 +93,12 @@ pipeline {
                     script {
                         def previousResult = currentBuild.previousBuild?.result
                         if (previousResult && !currentBuild.resultIsWorseOrEqualTo(previousResult)) {
-                            notifyBuild("Fixed: ${currentBuild.currentResult}")
+                            notifyBuild("Fixed")
                         }
                     }
                 }
                 failure {
-                    notifyBuild("Build / Test failure (${currentBuild.currentResult})")
+                    notifyBuild("Failed in BuildAndDeploy stage")
                 }
             }
         }
@@ -113,7 +111,7 @@ pipeline {
 
     post {
         unstable {
-            notifyBuild("Unstable Build (${currentBuild.currentResult})")
+            notifyBuild("Unstable Build")
         }
         always {
             cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index 37b0c1c46..1c5af21c7 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -25,7 +25,7 @@
  */
 
 LABEL = 'ubuntu'
-buildJdk = 'JDK 1.8 (latest)'
+buildJdk = 'JDK 1.7 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
 DOCKERHUB_CREDS = '10a5f89e-504b-11e8-945d-7fd7b29cc41c'
@@ -47,7 +47,7 @@ pipeline {
             }
             post {
                 failure {
-                    notifyBuild("Checkout failure (${currentBuild.currentResult})")
+                    notifyBuild("Checkout failure")
                 }
             }
         }
@@ -89,7 +89,7 @@ pipeline {
                     junit testResults: '**/target/failsafe-reports/TEST-*.xml'
                 }
                 failure {
-                    notifyBuild("Build / Test failure (${currentBuild.currentResult})")
+                    notifyBuild("Failed in htmlunit test stage")
                 }
             }
         }
@@ -139,7 +139,7 @@ pipeline {
                     junit testResults: '**/target/failsafe-reports/TEST-*.xml'
                 }
                 failure {
-                    notifyBuild("Build / Test failure (${currentBuild.currentResult})")
+                    notifyBuild("Failed in chrome test stage")
                 }
             }
         }
@@ -147,7 +147,7 @@ pipeline {
     }
     post {
         unstable {
-            notifyBuild("Unstable Build (${currentBuild.currentResult})")
+            notifyBuild("Unstable Build")
         }
         always {
             cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
@@ -156,7 +156,7 @@ pipeline {
             script {
                 def previousResult = currentBuild.previousBuild?.result
                 if (previousResult && !currentBuild.resultIsWorseOrEqualTo(previousResult)) {
-                    notifyBuild("Fixed: ${currentBuild.currentResult}")
+                    notifyBuild("Fixed")
                 }
             }
         }
-- 
2.39.5