aboutsummaryrefslogtreecommitdiffstats
path: root/ttcn3-nitb-sysinfo
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-04-09 15:46:57 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2018-05-02 09:36:57 +0000
commit18392ee604dfc0cc24a34edfeef904700a10c417 (patch)
tree4ffb26ea1b36a8d1429b9e3fa5e6e1f79ef286e8 /ttcn3-nitb-sysinfo
parentaff7d1b4d85e7885f9f7047e66e8b7ce3c6d899b (diff)
jenkins.sh: stay in the jenkins workspace, not in /tmp
On jenkins, place all logs and manage docker volumes in the workspace instead of a /tmp/* dir. Use $WORKSPACE/logs as docker volume base to begin with, thus there needs to be no copy from /tmp to $WORKSPACE/logs. On non-jenkins runs, place all in a /tmp/* dir still, but also skip copying of the logs: just have a /tmp/logs symlink to the last tmpdir. Change-Id: I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e
Diffstat (limited to 'ttcn3-nitb-sysinfo')
-rwxr-xr-xttcn3-nitb-sysinfo/jenkins.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh
index ac00642..530b4ee 100755
--- a/ttcn3-nitb-sysinfo/jenkins.sh
+++ b/ttcn3-nitb-sysinfo/jenkins.sh
@@ -43,9 +43,9 @@ docker run --rm \
-v bts-vol:/bts \
--name ${BUILD_TAG}-sysinfo-helper -d \
busybox /bin/sh -c 'sleep 1000 & wait'
-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 cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR
+docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR
+docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR
docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper
network_remove