From 25055844f46bc7d55be9fa1947c69b8e779659b4 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 27 Nov 2018 10:50:47 +0100
Subject: [PATCH] move update of JenkinsConfiguration repo out of the docker
environment
---
vars/analysis.groovy | 6 ++++++
vars/helper.groovy | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/vars/analysis.groovy b/vars/analysis.groovy
index b8031a2..cd998cb 100644
--- a/vars/analysis.groovy
+++ b/vars/analysis.groovy
@@ -24,6 +24,12 @@ def call(ArrayList<String> dependencyList) {
builds.removeAll { it == build }
}
}
+
+ // Update JenkinsConfiguration to have the latest valgrind suppressions
+ sh '''
+ cd /home/msk_jenkins/JenkinsConfiguration
+ sudo -u msk_jenkins git pull || true
+ '''
}
}
diff --git a/vars/helper.groovy b/vars/helper.groovy
index 16023b5..33b6747 100644
--- a/vars/helper.groovy
+++ b/vars/helper.groovy
@@ -230,15 +230,7 @@ def doValgrind(String label, String buildType) {
sh """
chown msk_jenkins -R /scratch
- pwd
- cd /
- ls
- cd /home
- ls
- cd /home/msk_jenkins
- ls
cd /home/msk_jenkins/JenkinsConfiguration
- sudo -u msk_jenkins git pull || true
cat valgrind.suppressions/common.supp valgrind.suppressions/${label}.supp > /scratch/valgrind.supp
cd /scratch/build-${parentJob}
--
GitLab