diff --git a/Jenkinsfile b/Jenkinsfile index bf5857beb8c52b56e08e5b82e24cfcfb816c250e..41143a502ce556eed1b76894a5a2493cec360205 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ node('master') { if (helper.isRelease()) { builders['msvc32'] = { load 'scripts/jenkins/msvc32.groovy' } - builders['clang'] = { load 'scripts/jenkins/clang.groovy' } + build job: 'OGS-6/clang-sanitizer', wait: false } parallel builders diff --git a/scripts/jenkins/clang.groovy b/scripts/jenkins/clang.groovy index d744d60e5d68a57c6d6d30731d4b5846ea1b8f3d..0286bbc641696a26e7d9ffc1d96de0e5a952a504 100644 --- a/scripts/jenkins/clang.groovy +++ b/scripts/jenkins/clang.groovy @@ -1,4 +1,8 @@ node('docker') { + def configure = load 'scripts/jenkins/lib/configure.groovy' + def build = load 'scripts/jenkins/lib/build.groovy' + def post = load 'scripts/jenkins/lib/post.groovy' + def defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache' def defaultCMakeOptions = '-DOGS_LIB_BOOST=System ' + @@ -16,20 +20,13 @@ node('docker') { stage 'Unit tests (Clang)' build.linux 'build', 'tests', 'UBSAN_OPTIONS=print_stacktrace=1 make -j $(nproc)' } - catch(err) { - echo "Clang sanitizer for unit tests failed, marking build as unstable!" - currentBuild.result = "UNSTABLE" - } + catch(err) { echo "Clang sanitizer for unit tests failed!" } try { stage 'End-to-end tests (Clang)' build.linux 'build', 'ctest', 'UBSAN_OPTIONS=print_stacktrace=1 make -j $(nproc)' } - catch(err) { - echo "Clang sanitizer for end-to-end tests failed, marking build as unstable!" - currentBuild.result = "UNSTABLE" - } - + catch(err) { echo "Clang sanitizer for end-to-end tests failed!" } } stage 'Post (Clang)'