osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/30769 )
Change subject: ttcn3-*/jenkins*.sh: use $SUBNET everywhere
......................................................................
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
---
M ttcn3-bsc-test-vamos/jenkins.sh
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-remsim-test/jenkins.sh
M ttcn3-sccp-test/jenkins.sh
7 files changed, 45 insertions(+), 11 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh
index e686710..3f7f1ec 100755
--- a/ttcn3-bsc-test-vamos/jenkins.sh
+++ b/ttcn3-bsc-test-vamos/jenkins.sh
@@ -60,7 +60,13 @@
--name ${BUILD_TAG}-bts$i -d \
$DOCKER_ARGS \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
- /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy
$BTS_FEATURES 172.18.31.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log
2>&1"
+ /bin/sh -c "/usr/local/bin/respawn.sh \
+ osmo-bts-omldummy \
+ $BTS_FEATURES \
+ 172.18.$SUBNET.20 \
+ $((i + 1234)) \
+ 1 \
+ >>/data/osmo-bts-omldummy-${i}.log 2>&1"
done
echo Starting container with BSC testsuite
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 @@
--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 @@
--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
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 3438771..3f1f2f1 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -68,10 +68,12 @@
--log-file-level DEBUG \
--log-file-time \
--log-level INFO \
- -R 172.18.9.20 -r 172.18.9.22 \
- --trx [email protected]:5700/1 \
- --trx [email protected]:5700/2 \
- --trx [email protected]:5700/3
>>/data/fake_trx.out 2>&1"
+ -R 172.18.$SUBNET.20 \
+ -r 172.18.$SUBNET.22 \
+ --trx [email protected].$SUBNET.20:5700/1 \
+ --trx [email protected].$SUBNET.20:5700/2 \
+ --trx [email protected].$SUBNET.20:5700/3 \
+ >>/data/fake_trx.out 2>&1"
}
start_trxcon() {
@@ -84,7 +86,10 @@
--name ${BUILD_TAG}-trxcon -d \
$DOCKER_ARGS \
$REPO_USER/osmocom-bb-host-master \
- /bin/sh -c "trxcon -i 172.18.9.21 -s
/data/unix/osmocom_l2 >>/data/trxcon.log 2>&1"
+ /bin/sh -c "trxcon \
+ -i 172.18.$SUBNET.21 \
+ -s /data/unix/osmocom_l2 \
+ >>/data/trxcon.log 2>&1"
}
start_virtphy() {
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 4bd2480..dfcf403 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -32,7 +32,11 @@
--name ${BUILD_TAG}-pcu-sns -d \
$DOCKER_ARGS \
$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
- /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c
/data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1"
+ /bin/sh -c "/usr/local/bin/respawn.sh \
+ osmo-pcu \
+ -c /data/osmo-pcu.cfg \
+ -i 172.18.$SUBNET.10 \
+ >>/data/osmo-pcu.log 2>&1"
echo Starting container with PCU testsuite
docker run --rm \
diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 2a6a9d8..b9e74b4 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -30,7 +30,10 @@
--name ${BUILD_TAG}-bankd -d \
$DOCKER_ARGS \
$REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
- /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10
>/data/osmo-remsim-bankd.log 2>&1"
+ /bin/sh -c "pcscd; \
+ osmo-remsim-bankd \
+ -i 172.18.$SUBNET.10 \
+ >/data/osmo-remsim-bankd.log 2>&1"
}
start_client() {
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index d1a9a11..3a3346a 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -28,7 +28,11 @@
--name ${BUILD_TAG}-stp -d \
$DOCKER_ARGS \
$REPO_USER/osmo-stp-master \
- /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C
/data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1"
+ /bin/sh -c "sccp_demo_user \
+ -l 172.18.$SUBNET.200 \
+ -r 172.18.$SUBNET.203 \
+ -C /data/sccp_demo_user.cfg \
+ >>/data/sccp_demo_user.log 2>&1"
echo Starting container with SCCP testsuite
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30769
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f
Gerrit-Change-Number: 30769
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
