diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-02-06 20:20:19 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-06 20:20:49 +0000 |
| commit | d770629280f6d907b46c8a0ec3786095b35fe804 (patch) | |
| tree | f8e1e2348b97eae938014a28d4a2afd00b176eaa /ttcn3-msc-test | |
| parent | bcc29baf39818eee02d663cd66e93209ba6ca644 (diff) | |
jenkins: Add shared jenkins-common.sh
the common script contains some copy+pasted parts between the different
jobs.
Diffstat (limited to 'ttcn3-msc-test')
| -rwxr-xr-x | ttcn3-msc-test/jenkins.sh | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 909dcf8..f8637ce 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -1,23 +1,9 @@ #!/bin/sh -set -x +. ../jenkins-common.sh -# non-jenkins execution: assume local user name -if [ "x$REPO_USER" = "x" ]; then - REPO_USER=$USER -fi +network_create 172.18.1.0/24 -# non-jenkins execution: put logs in /tmp -if [ "x$WORKSPACE" = "x" ]; then - WORKSPACE=/tmp -fi - -NET_NAME="msc-tester" - -echo Creating network $NET_NAME -docker network create --internal --subnet 172.18.1.0/24 $NET_NAME - -VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ @@ -56,13 +42,11 @@ docker run --rm \ $REPO_USER/ttcn3-msc-test echo Stopping containers -docker container kill msc -docker container kill stp +docker container kill ${BUILD_TAG}-msc +docker container kill ${BUILD_TAG}-stp -echo Deleting network $NET_NAME -docker network rm $NET_NAME +network_remove rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs cp -a $VOL_BASE_DIR/* $WORKSPACE/logs/ -#rm -rf $VOL_BASE_DIR |