From 551b47fa5b5cdc1c59cfda53d820e89e11d0dd28 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 2 Oct 2018 17:08:21 +0200
Subject: [PATCH] obtain valgrind and coverage results only for Debug builds
---
vars/buildTestDeploy.groovy | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/vars/buildTestDeploy.groovy b/vars/buildTestDeploy.groovy
index e4072d5..07a598f 100644
--- a/vars/buildTestDeploy.groovy
+++ b/vars/buildTestDeploy.groovy
@@ -35,6 +35,7 @@
// This is the function called from the .jenkinsfile
def call(ArrayList<String> dependencyList) {
+ // List of builds to be run. Format must be "<docker_image_name>-<cmake_build_type>"
def builds = [ 'xenial-Debug',
'xenial-Release',
'bionic-Debug',
@@ -240,23 +241,28 @@ def doPublish(ArrayList<String> builds) {
// unstash result files into subdirectories
builds.each {
dir("${it}") {
+ def (label, buildType) = buildName.tokenize('-')
- // get cobertura result
- try {
- unstash "cobertura-${it}"
- }
- catch(all) {
- echo("Could not retreive stashed cobertura results for ${it}")
- currentBuild.result = 'FAILURE'
+ // get cobertura coverage result (only Debug)
+ if(buildType == "Debug") {
+ try {
+ unstash "cobertura-${it}"
+ }
+ catch(all) {
+ echo("Could not retreive stashed cobertura results for ${it}")
+ currentBuild.result = 'FAILURE'
+ }
}
- // get valgrind result
- try {
- unstash "valgrind-${it}"
- }
- catch(all) {
- echo("Could not retreive stashed valgrind results for ${it}")
- currentBuild.result = 'FAILURE'
+ // get valgrind result (only Debug)
+ if(buildType == "Debug") {
+ try {
+ unstash "valgrind-${it}"
+ }
+ catch(all) {
+ echo("Could not retreive stashed valgrind results for ${it}")
+ currentBuild.result = 'FAILURE'
+ }
}
}
--
GitLab