From 26445e26a8fba84f3d3bf6af021ebb6731d94c59 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 16 Nov 2018 14:17:51 +0100
Subject: [PATCH] [Jenkins] Wrap Analyzer stage in try-block.
---
Jenkinsfile | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index aa4b9e6a5a8..7e967570a82 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -367,20 +367,21 @@ pipeline {
}
steps {
script {
- lock(resource: "conanCache-${env.NODE_NAME}") {
- sh 'conan user'
- sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
- configure {
- cmakeOptions =
- '"-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=include-what-you-use;-Xiwyu;--mapping_file=../scripts/jenkins/iwyu-mappings.imp" ' +
- '-DCMAKE_LINK_WHAT_YOU_USE=ON ' +
- '"-DCMAKE_CXX_CPPCHECK=cppcheck;--std=c++11;--language=c++;--suppress=syntaxError;--suppress=preprocessorErrorDirective:*/ThirdParty/*;--suppress=preprocessorErrorDirective:*conan*/package/*" ' +
- '-DCMAKE_CXX_CLANG_TIDY=clang-tidy-3.9 '
- config = 'Release'
- }
+ sh 'conan user'
+ sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
+ configure {
+ cmakeOptions =
+ '"-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=include-what-you-use;-Xiwyu;--mapping_file=../scripts/jenkins/iwyu-mappings.imp" ' +
+ '-DCMAKE_LINK_WHAT_YOU_USE=ON ' +
+ '"-DCMAKE_CXX_CPPCHECK=cppcheck;--std=c++11;--language=c++;--suppress=syntaxError;--suppress=preprocessorErrorDirective:*/ThirdParty/*;--suppress=preprocessorErrorDirective:*conan*/package/*" ' +
+ '-DCMAKE_CXX_CLANG_TIDY=clang-tidy-3.9 '
+ config = 'Release'
+ }
+ try {
+ build { target = 'check-header' }
+ build { target = 'all' }
}
- build { target = 'check-header' }
- build { target = 'all' }
+ catch (Exception e) { }
}
}
}
--
GitLab