From 4a8c4fef3517c6c30ac37165c9e80f152c40441b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 24 Jun 2018 12:30:17 +0200 Subject: [PATCH] Generalized run_ut step in Jenkinsfile. --- Jenkinsfile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c11a500c0..2bbadf168 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,21 +37,12 @@ node("master") { }, "Unit testing": { - rel_work_dir = target + "/BUILD/build.linux-release" - work_dir = pwd() + "/" + rel_work_dir - + ut_result = "no-result" withDockerContainer(image: "jenkins-${target}") { - - sh """ -cd ${work_dir} -set +e -LD_LIBRARY_PATH=. TESTSRC=../../.. TESTTMP=testtmp xvfb-run ./ut_runner -c -a | tee ut_runner.xml -set -e -""" - + ut_result = run_ut(target) } - junit(testResults: "${rel_work_dir}/ut_runner.xml") + junit(testResults: ut_result) }, "Installtest": {