osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28005 ) Change subject: ttcn3-bsc-test: set osmo-bts-omldummy features ...................................................................... ttcn3-bsc-test: set osmo-bts-omldummy features Add arguments to osmo-bts-omldummy to properly report the features that were previously assumed for osmo-bts even without reporting them, until this was changed in osmo-bsc I7fca42a39a4bc98a6ea8b9cfab28c4bad3a6a0aa. Related: SYS#5922, OS#5538 Change-Id: Ib22f25431330676d59900de7bfb3d89e7872baf1 --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh 3 files changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index f37711f..1fb3541 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -45,6 +45,8 @@ $DOCKER_ARGS \ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX +BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS" + for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ @@ -54,7 +56,7 @@ --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 -f VAMOS 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.31.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 0a3c073..5ba4925 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -32,6 +32,8 @@ $DOCKER_ARGS \ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX +BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" + for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ @@ -40,7 +42,7 @@ --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 172.18.12.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.12.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.sh b/ttcn3-bsc-test/jenkins.sh index fd9046c..5f3ba53 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -44,6 +44,8 @@ $DOCKER_ARGS \ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX +BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" + for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ @@ -53,7 +55,7 @@ --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 172.18.2.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.2.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1" done echo Starting container with BSC testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib22f25431330676d59900de7bfb3d89e7872baf1 Gerrit-Change-Number: 28005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged