diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2022-12-22 13:01:42 +0100 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2023-01-16 11:41:11 +0000 |
| commit | 4cb0fac1b0e18b8036cea66225681160561f422d (patch) | |
| tree | c9bf6118b8e2a078da20b6ba72e34041c99a38e5 /ttcn3-bsc-test | |
| parent | ea90e44ab05e0b332a7754f5c776c1144754aa82 (diff) | |
ttcn3-*/jenkins*.sh: use $SUBNET everywhere
Use the SUBNET variable instead of hardcoding it in some places. Split
commands across multiple lines while at it to improve readability.
Related: OS#5802
Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f
Diffstat (limited to 'ttcn3-bsc-test')
| -rwxr-xr-x | ttcn3-bsc-test/jenkins-sccplite.sh | 8 | ||||
| -rwxr-xr-x | ttcn3-bsc-test/jenkins.sh | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index e402b33..6dac56a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -51,7 +51,13 @@ for i in "0 1" "1 1" "2 4"; do --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.12.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index c018046..2138169 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -60,7 +60,13 @@ for i in "0 1" "1 1" "2 4"; do --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.2.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite |