From 949bb7b0b633ae8a7d36962ba11562400d217c20 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Wed, 14 Nov 2018 17:51:20 +0100
Subject: [PATCH] fixed syntax error
---
vars/helper.groovy | 45 +++++++++++++++++----------------------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/vars/helper.groovy b/vars/helper.groovy
index 86eb483..4cff204 100644
--- a/vars/helper.groovy
+++ b/vars/helper.groovy
@@ -156,35 +156,24 @@ def doBuilddirArtefact(String label, String buildType) {
/**********************************************************************************************************************/
def doBuild(String label, String buildType) {
-
- stages("build for ${label}-${buildType}") {
- stage("actual build") {
- // start the build
- sh """
- chown -R msk_jenkins /scratch
- sudo -u msk_jenkins mkdir -p /scratch/build-${JOB_NAME}
- sudo -u msk_jenkins mkdir -p /scratch/install
- cd /scratch/build-${JOB_NAME}
- sudo -u msk_jenkins cmake /scratch/source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true
- sudo -u msk_jenkins make $MAKEOPTS
- """
- }
+ catchError {
+ // start the build
+ sh """
+ chown -R msk_jenkins /scratch
+ sudo -u msk_jenkins mkdir -p /scratch/build-${JOB_NAME}
+ sudo -u msk_jenkins mkdir -p /scratch/install
+ cd /scratch/build-${JOB_NAME}
+ sudo -u msk_jenkins cmake /scratch/source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true
+ sudo -u msk_jenkins make $MAKEOPTS
+ """
+ }
+ script {
+ // generate and archive artefact from build directory (used for the analysis job)
+ sh """
+ sudo -u msk_jenkins tar zcf build-${JOB_NAME}-${label}-${buildType}.tgz /scratch
+ """
+ archiveArtifacts artifacts: "build-${JOB_NAME}-${label}-${buildType}.tgz", onlyIfSuccessful: false
}
- post {
- always {
- node("Archive build artefact") {
- script {
- // generate and archive artefact from build directory (used for the analysis job)
- sh """
- sudo -u msk_jenkins tar zcf build-${JOB_NAME}-${label}-${buildType}.tgz /scratch
- """
- archiveArtifacts artifacts: "build-${JOB_NAME}-${label}-${buildType}.tgz", onlyIfSuccessful: false
- }
- }
- } // end always
- } // end post
-
-
}
/**********************************************************************************************************************/
--
GitLab