From 2f61bf81e908ccaa989a1e773fb193935b0eee43 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Mon, 9 Apr 2018 15:28:25 +0200
Subject: jenkins.sh: have one common function to collect logs

To remove code dup and prepare a change to where logs are written, add
collect_logs() to jenkins_common.sh and call that from each jenkins.sh after
the tests are done.

The 'rm -rf' is already done before a test starts. No need to do that again
after each test.

Change-Id: I5d8472ec36b07c828685b1bd7718e31392d168a3
---
 ttcn3-bsc-test/jenkins.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'ttcn3-bsc-test/jenkins.sh')

diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 160d5a6..7536396 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -51,8 +51,4 @@ docker container kill ${BUILD_TAG}-bsc
 docker container kill ${BUILD_TAG}-stp
 
 network_remove
-
-rm -rf $WORKSPACE/logs
-mkdir -p $WORKSPACE/logs
-cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/
-cat $WORKSPACE/logs/bsc-tester/junit-*.log || true
+collect_logs
-- 
cgit v1.2.3