From 3da153f2ed8c7e378f01f14468adee50c780f6fb Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Wed, 20 Feb 2019 11:15:41 +0100
Subject: [PATCH] slight syntax change
---
vars/helper.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vars/helper.groovy b/vars/helper.groovy
index 78b9a36..85582ee 100644
--- a/vars/helper.groovy
+++ b/vars/helper.groovy
@@ -167,7 +167,7 @@ def doBuild(String label, String buildType) {
sudo -H -E -u msk_jenkins mkdir -p /scratch/install
cd /scratch/build-${JOB_NAME}
# We might run only part of the project from a sub-directory. If it is empty the trailing / does not confuse cmake
- for VAR in ${env.JOB_VARIABLES}; do
+ for VAR in \${JOB_VARIABLES}; do
export `eval echo \${VAR}`
done
sudo -H -E -u msk_jenkins cmake /scratch/source/\${RUN_FROM_SUBDIR} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
@@ -196,7 +196,7 @@ def doTest(String label, String buildType) {
if [ -z "\${CTESTOPTS}" ]; then
CTESTOPTS="${env.MAKEOPTS}"
fi
- for VAR in ${env.JOB_VARIABLES} \${TEST_VARIABLES}; do
+ for VAR in \${JOB_VARIABLES} \${TEST_VARIABLES}; do
export `eval echo \${VAR}`
done
ctest --no-compress-output \${CTESTOPTS} -T Test -V || true
--
GitLab