From: Martin Stockhammer <martin_s@apache.org>
Date: Tue, 1 May 2018 11:41:08 +0000 (+0200)
Subject: Fixing pipeline syntax
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=16a6517cb0107a1eeab31ea1fa6ec75e4bf1fd2f;p=archiva.git

Fixing pipeline syntax
---

diff --git a/Jenkinsfile b/Jenkinsfile
index 3d74c5fde..92e4561d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,78 +6,76 @@ def deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
 node(labels) {
 
     def PWD = pwd()
-    def REPO_DIR="${env.JENKINS_HOME}/.repo-${env.JOB_NAME.replace('/','_')}"
+    def REPO_DIR = "${env.JENKINS_HOME}/.repo-${env.JOB_NAME.replace('/', '_')}"
     echo "Info: Job-Name=${JOB_NAME}, Branch=${BRANCH_NAME}, Workspace=${PWD}, Repo-Dir=${REPO_DIR}"
 
-    stages {
-        stage('Checkout') {
-            steps {
-                checkout scm
-                script {
-                    currentBuild.displayName = "Archiva master build"
-                    currentBuild.description = "This builds, tests and deploys the current artifact from archiva master branch."
-                }
+    stage('Checkout') {
+        steps {
+            checkout scm
+            script {
+                currentBuild.displayName = "Archiva master build"
+                currentBuild.description = "This builds, tests and deploys the current artifact from archiva master branch."
             }
-            post {
-                failure {
-                    notifyBuild("Checkout failure")
-                }
+        }
+        post {
+            failure {
+                notifyBuild("Checkout failure")
             }
         }
+    }
 
-        stage('Build') {
-            steps {
-                timeout(120) {
-                    withMaven(maven: buildMvn, jdk: buildJdk,
-                            mavenSettingsConfig: deploySettings,
-                            mavenLocalRepo: REPO_DIR
-                    )
-                            {
-                                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"
+    stage('Build') {
+        steps {
+            timeout(120) {
+                withMaven(maven: buildMvn, jdk: buildJdk,
+                        mavenSettingsConfig: deploySettings,
+                        mavenLocalRepo: REPO_DIR
+                )
+                        {
+                            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"
 
-                                // Run test phase / ignore test failures
-                                // -B: Batch mode
-                                // -U: Force snapshot update
-                                // -e: Produce execution error messages
-                                // -fae: Fail at the end
-                                // -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"
-                            }
-                }
+                            // Run test phase / ignore test failures
+                            // -B: Batch mode
+                            // -U: Force snapshot update
+                            // -e: Produce execution error messages
+                            // -fae: Fail at the end
+                            // -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"
+                        }
+            }
+        }
+        post {
+            success {
+                junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], '**/target/surefire-reports/TEST-*.xml'
+                archiveArtifacts '**/target/*.war,**/target/*-bin.zip'
             }
-            post {
-                success {
-                    junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], '**/target/surefire-reports/TEST-*.xml'
-                    archiveArtifacts '**/target/*.war,**/target/*-bin.zip'
-                }
-                failure {
-                    notifyBuild("Build / Test failure")
-                }
+            failure {
+                notifyBuild("Build / Test failure")
             }
         }
+    }
 
-        stage('Deploy') {
-            steps {
-                timeout(120) {
-                    withMaven(maven: buildMvn, jdk: buildJdk,
-                            mavenSettingsConfig: deploySettings,
-                            mavenLocalRepo: REPO_DIR
-                    )
-                            {
-                                sh "mvn deploy -B -Dmaven.test.skip=true"
-                            }
-                }
+    stage('Deploy') {
+        steps {
+            timeout(120) {
+                withMaven(maven: buildMvn, jdk: buildJdk,
+                        mavenSettingsConfig: deploySettings,
+                        mavenLocalRepo: REPO_DIR
+                )
+                        {
+                            sh "mvn deploy -B -Dmaven.test.skip=true"
+                        }
             }
-            post {
-                failure {
-                    notifyBuild("Deploy failure")
-                }
+        }
+        post {
+            failure {
+                notifyBuild("Deploy failure")
             }
         }
     }
@@ -89,7 +87,6 @@ node(labels) {
     }
 }
 
-
 // Send a notification about the build status
 def notifyBuild(String buildStatus) {
     // default the value