diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-08-24 16:15:40 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-08-27 12:49:43 +0200 |
| commit | 1f45fb08ffd9ad2c9037f199b7f3c0b93b97e89a (patch) | |
| tree | 9d4b10bb6d5b56ef96710cded64ceeb83654c335 /ttcn3-bts-test | |
| parent | 8d4a97a3fc9fb75fd2edbdc5c5d50df93a761b1f (diff) | |
jenkins-common.sh: Add function to print docker network related parameters
Change-Id: Ie00561de7a4494065156a124565e2190151e6019
Diffstat (limited to 'ttcn3-bts-test')
| -rwxr-xr-x | ttcn3-bts-test/jenkins.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index b05a335..f544d8a 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -12,7 +12,7 @@ docker_images_require \ start_bsc() { echo Starting container with BSC docker run --rm \ - --network $NET_NAME --ip 172.18.9.11 \ + $(docker_network_params $SUBNET 11) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ @@ -31,7 +31,7 @@ start_bts() { exit 23 fi docker run --rm \ - --network $NET_NAME --ip 172.18.9.20 \ + $(docker_network_params $SUBNET 20) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ @@ -45,7 +45,7 @@ start_bts() { start_fake_trx() { echo Starting container with fake_trx docker run --rm \ - --network $NET_NAME --ip 172.18.9.21 \ + $(docker_network_params $SUBNET 21) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ @@ -65,7 +65,7 @@ start_fake_trx() { start_trxcon() { echo Starting container with trxcon docker run --rm \ - --network $NET_NAME --ip 172.18.9.22 \ + $(docker_network_params $SUBNET 22) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/trxcon:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ @@ -78,7 +78,7 @@ start_trxcon() { start_virtphy() { echo Starting container with virtphy docker run --rm \ - --network $NET_NAME --ip 172.18.9.22 \ + $(docker_network_params $SUBNET 22) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/virtphy:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ @@ -92,7 +92,7 @@ start_testsuite() { echo Starting container with BTS testsuite variant=$1 # e.g 'generic', 'oml', 'hopping' docker run --rm \ - --network $NET_NAME --ip 172.18.9.10 \ + $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/bts-tester-${variant}:/data \ @@ -102,7 +102,8 @@ start_testsuite() { $REPO_USER/ttcn3-bts-test } -network_create 9 +SUBNET=9 +network_create $SUBNET mkdir $VOL_BASE_DIR/bts-tester-generic cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ @@ -160,6 +161,7 @@ docker container kill ${BUILD_TAG}-bsc # switch back from virtphy + osmo-bts-virtual to osmo-bts-trx docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts + cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ start_bts trx 1 start_fake_trx @@ -187,7 +189,7 @@ docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bsc docker container kill ${BUILD_TAG}-bts - +docker container kill ${BUILD_TAG}-bsc network_remove rm -rf $VOL_BASE_DIR/unix |