diff --git a/jenkins-common.sh b/jenkins-common.sh index bef68f69..281807af 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -10,7 +10,10 @@ network_remove() { docker network remove $NET_NAME } - +collect_logs() { + cp -a "$VOL_BASE_DIR"/* "$WORKSPACE"/logs/ + cat "$WORKSPACE"/logs/*/junit-*.log || true +} set -x diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh index 5880aed4..61f7c054 100755 --- a/m3ua-test/jenkins.sh +++ b/m3ua-test/jenkins.sh @@ -28,6 +28,4 @@ docker run --rm \ docker container stop -t 1 ${BUILD_TAG}-stp network_remove - -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/m3ua-tester/junit-*.log || true +collect_logs diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index 5ac0106a..7c1939ec 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -10,9 +10,6 @@ cp osmo-stp.cfg $VOL_BASE_DIR/stp/ network_create 172.18.6.0/24 -rm -rf $WORKSPACE/logs || /bin/true -mkdir -p $WORKSPACE/logs - # start container with STP in background docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ @@ -31,6 +28,4 @@ docker run --rm \ docker container stop -t 1 ${BUILD_TAG}-stp network_remove - -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/sua-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 160d5a6c..75363966 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 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 00bcde45..e8c77f36 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -66,9 +66,5 @@ docker container kill ${BUILD_TAG}-bts docker container kill ${BUILD_TAG}-bsc network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs rm -rf $VOL_BASE_DIR/unix -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/bts-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 56f76ecd..487da31f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -34,8 +34,4 @@ docker run --rm \ docker container stop ${BUILD_TAG}-ggsn network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/ggsn-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 7cd74ae1..5d208dfd 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -30,8 +30,4 @@ echo Stopping containers docker container kill ${BUILD_TAG}-hlr network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/hlr-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 755ce9bb..7933e1cd 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -30,8 +30,4 @@ docker run --rm \ docker container stop ${BUILD_TAG}-mgw network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/mgw-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 635b656b..560eea76 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -47,9 +47,5 @@ docker container kill ${BUILD_TAG}-msc docker container kill ${BUILD_TAG}-stp network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs rm -rf $VOL_BASE_DIR/unix -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/msc-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index fa61401e..ac006422 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 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 8f8a37b8..f1481b15 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -32,8 +32,4 @@ echo Stopping containers docker container kill ${BUILD_TAG}-sgsn network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/sgsn-tester/junit-*.log || true +collect_logs diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 63e6c8a7..37a8e958 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -36,9 +36,5 @@ echo Stopping containers docker container kill ${BUILD_TAG}-sip-connector network_remove - -rm -rf $WORKSPACE/logs -mkdir -p $WORKSPACE/logs rm -rf $VOL_BASE_DIR/unix -cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -cat $WORKSPACE/logs/sip-tester/junit-*.log || true +collect_logs