diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-09 15:28:25 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2018-04-24 13:46:05 +0000 |
commit | 2f61bf81e908ccaa989a1e773fb193935b0eee43 (patch) | |
tree | 410a30b2b6c58d056dc7d3e976a1b3fc9675e49f /ttcn3-nitb-sysinfo | |
parent | 9f5131ab9d61279271e55165ae8f39a15a2edca7 (diff) |
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
Diffstat (limited to 'ttcn3-nitb-sysinfo')
-rwxr-xr-x | ttcn3-nitb-sysinfo/jenkins.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index fa61401..ac00642 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -43,11 +43,10 @@ docker run --rm \ -v bts-vol:/bts \ --name ${BUILD_TAG}-sysinfo-helper -d \ busybox /bin/sh -c 'sleep 1000 & wait' -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $WORKSPACE/logs docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $WORKSPACE/logs docker cp ${BUILD_TAG}-sysinfo-helper:/bts $WORKSPACE/logs docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper network_remove +collect_logs |