diff options
| -rwxr-xr-x | ggsn-test/jenkins.sh | 3 | ||||
| -rwxr-xr-x | m3ua-test/jenkins.sh | 3 | ||||
| -rwxr-xr-x | mgw-test/jenkins.sh | 3 | ||||
| -rwxr-xr-x | sua-test/jenkins.sh | 3 | ||||
| -rwxr-xr-x | ttcn3-bsc-test/jenkins.sh | 8 | ||||
| -rwxr-xr-x | ttcn3-msc-test/jenkins.sh | 6 | ||||
| -rwxr-xr-x | ttcn3-nitb-sysinfo/jenkins.sh | 7 |
7 files changed, 19 insertions, 14 deletions
diff --git a/ggsn-test/jenkins.sh b/ggsn-test/jenkins.sh index 7386718..3bbae59 100755 --- a/ggsn-test/jenkins.sh +++ b/ggsn-test/jenkins.sh @@ -29,7 +29,7 @@ docker run --cap-add=NET_ADMIN \ --rm \ --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ - --name ggsn -d \ + --name ${BUILD_TAG}-ggsn -d \ $REPO_USER/osmo-ggsn-master # start docker container with testsuite in foreground @@ -37,6 +37,7 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network $NET_NAME --ip 172.18.3.202 \ -v $VOL_BASE_DIR/ggsn-tester:/data \ + --name ${BUILD_TAG}-ggsn-test \ $REPO_USER/ggsn-test # stop GGSN after test has completed diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh index 42b5c3f..f831abc 100755 --- a/m3ua-test/jenkins.sh +++ b/m3ua-test/jenkins.sh @@ -32,13 +32,14 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network $NET_NAME --ip 172.18.7.200 \ -v $VOL_BASE_DIR/stp:/data \ - --name stp \ + --name ${BUILD_TAG}-stp \ -d $REPO_USER/osmo-stp-master # start docker container with tests docker run --rm \ --network $NET_NAME --ip 172.18.7.2 \ -v $VOL_BASE_DIR/m3ua-tester:/data \ + --name ${BUILD_TAG}-m3ua-test \ $REPO_USER/m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log docker container stop -t 1 stp diff --git a/mgw-test/jenkins.sh b/mgw-test/jenkins.sh index d324d78..d6e0742 100755 --- a/mgw-test/jenkins.sh +++ b/mgw-test/jenkins.sh @@ -26,13 +26,14 @@ docker network create --internal --subnet 172.18.4.0/24 $NET_NAME docker run --rm \ --network $NET_NAME --ip 172.18.4.180 \ -v $VOL_BASE_DIR/mgw:/data \ - --name mgw -d \ + --name ${BUILD_TAG}-mgw -d \ $REPO_USER/osmo-mgw-master # start docker container with testsuite in foreground docker run --rm \ --network $NET_NAME --ip 172.18.4.181 \ -v $VOL_BASE_DIR/mgw-tester:/data \ + --name ${BUILD_TAG}-ttcn3-mgw-test \ $REPO_USER/mgw-test # stop mgw after test has completed diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index 11cb37a..8bff861 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -32,13 +32,14 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network $NET_NAME --ip 172.18.6.200 \ -v $VOL_BASE_DIR/stp:/data \ - --name stp \ + --name ${BUILD_TAG}-stp \ -d $REPO_USER/osmo-stp-master # start docker container with tests docker run --rm \ --network $NET_NAME --ip 172.18.6.3 \ -v $VOL_BASE_DIR/sua-tester:/data \ + --name ${BUILD_TAG}-sua-test \ $REPO_USER/sua-test > $WORKSPACE/logs/junit-xml-sua.log docker container stop -t 1 stp diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 2d17dfd..955e871 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -29,21 +29,21 @@ echo Starting container with STP docker run --rm \ --network $NET_NAME --ip 172.18.2.200 \ -v $VOL_BASE_DIR/stp:/data \ - --name stp -d \ + --name ${BUILD_TAG}-stp -d \ $REPO_USER/osmo-stp-master echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.2.20 \ -v $VOL_BASE_DIR/bsc:/data \ - --name bsc -d \ + --name ${BUILD_TAG}-bsc -d \ $REPO_USER/osmo-bsc-master for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ --network $NET_NAME --ip 172.18.2.10$i \ - --name bts$i -d \ + --name ${BUILD_TAG}-bts$i -d \ $REPO_USER/osmo-bts-omldummy ./respawn.sh 172.18.2.20 $((i + 1234)) 1 done @@ -51,7 +51,7 @@ echo Starting container with BSC testsuite docker run --rm \ --network $NET_NAME --ip 172.18.2.203 \ -v $VOL_BASE_DIR/bsc-tester:/data \ - --name ttcn3-bsc-test \ + --name ${BUILD_TAG}-ttcn3-bsc-test \ $REPO_USER/ttcn3-bsc-test echo Stopping containers diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 5be838d..909dcf8 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -35,7 +35,7 @@ echo Starting container with STP docker run --rm \ --network $NET_NAME --ip 172.18.1.200 \ -v $VOL_BASE_DIR/stp:/data \ - --name stp -d \ + --name ${BUILD_TAG}-stp -d \ $REPO_USER/osmo-stp-master echo Starting container with MSC @@ -43,7 +43,7 @@ docker run --rm \ --network $NET_NAME --ip 172.18.1.10 \ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ - --name msc -d \ + --name ${BUILD_TAG}-msc -d \ $REPO_USER/osmo-msc-master \ /usr/local/bin/osmo-msc -M /data/unix/mncc @@ -52,7 +52,7 @@ docker run --rm \ --network $NET_NAME --ip 172.18.1.103 \ -v $VOL_BASE_DIR/msc-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ - --name ttcn3-msc-test \ + --name ${BUILD_TAG}-ttcn3-msc-test \ $REPO_USER/ttcn3-msc-test echo Stopping containers diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index a52c16e..c6778c2 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -21,7 +21,7 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network sigtran --ip 172.18.5.20 \ -v nitb-vol:/data \ - --name nitb -d \ + --name ${BUILD_TAG}-nitb -d \ $REPO_USER/osmo-nitb-master # start container with bts in background @@ -30,7 +30,7 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network sigtran --ip 172.18.5.210 \ -v bts-vol:/data \ - --name bts -d \ + --name ${BUILD_TAG}-bts -d \ $REPO_USER/osmo-bts-master @@ -40,6 +40,7 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network sigtran --ip 172.18.5.230 \ -v ttcn3-nitb-sysinfo-vol:/data \ + --name ${BUILD_TAG}-ttcn3-nitb-sysinfo \ $REPO_USER/ttcn3-nitb-sysinfo # stop bts + nitb after test has completed @@ -51,7 +52,7 @@ docker run --rm \ -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \ -v nitb-vol:/nitb \ -v bts-vol:/bts \ - --name sysinfo-helper -d \ + --name ${BUILD_TAG}-sysinfo-helper -d \ busybox /bin/sh -c 'sleep 1000 & wait' rm -rf $WORKSPACE/logs mkdir -p $WORKSPACE/logs |