<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19623">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-bts-test/jenkins.sh: use bts-tester-{generic,oml,virtphy,hopping}<br><br>Let's use separate directories to store the artifacts of different<br>TTCN-3 test case groups. This would prevent the test suite from<br>overwriting *.log and *.pcap files when running both generic and<br>hopping configurations together, and simplify the overall hierarchy.<br><br>Change-Id: I7c41cfb395047433e22e9c65c8c00ae284717b32<br>Related: SYS#4868, OS#4546<br>---<br>M ttcn3-bts-test/jenkins.sh<br>1 file changed, 16 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index cd6fc38..544825c 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -90,11 +90,12 @@</span><br><span> </span><br><span> start_testsuite() {</span><br><span> echo Starting container with BTS testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+ variant=$1 # e.g 'generic', 'oml', 'hopping'</span><br><span> docker run --rm \</span><br><span> --network $NET_NAME --ip 172.18.9.10 \</span><br><span> --ulimit core=-1 \</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v $VOL_BASE_DIR/bts-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/bts-tester-${variant}:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-bts-test \</span><br><span> $DOCKER_ARGS \</span><br><span>@@ -103,14 +104,20 @@</span><br><span> </span><br><span> network_create 9</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-mkdir $VOL_BASE_DIR/bts-tester</span><br><span style="color: hsl(0, 100%, 40%);">-cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/bts-tester-generic</span><br><span style="color: hsl(120, 100%, 40%);">+cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/bts-tester-virtphy</span><br><span style="color: hsl(120, 100%, 40%);">+cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/bts-tester-oml</span><br><span style="color: hsl(120, 100%, 40%);">+cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-oml/</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/bts-tester-hopping</span><br><span style="color: hsl(120, 100%, 40%);">+cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/</span><br><span> </span><br><span> # Work around for a bug in osmo-bts when all transceivers use IPAC_PROTO_RSL_TRX0.</span><br><span> # Enables patching of IPA stream ID. TODO: remove as soon as we make a new release.</span><br><span> if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span> sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" -i \</span><br><span style="color: hsl(0, 100%, 40%);">- "$VOL_BASE_DIR/bts-tester/BTS_Tests.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+ "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"</span><br><span> fi</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bsc</span><br><span>@@ -131,7 +138,7 @@</span><br><span> start_bts trx 0</span><br><span> start_fake_trx</span><br><span> start_trxcon</span><br><span style="color: hsl(0, 100%, 40%);">-start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite generic</span><br><span> </span><br><span> # 2) some GPRS tests require virt_phy</span><br><span> echo "Changing to virtphy configuration"</span><br><span>@@ -143,8 +150,7 @@</span><br><span> start_bts virtual 0</span><br><span> start_virtphy</span><br><span> # ... and execute the testsuite again with different cfg</span><br><span style="color: hsl(0, 100%, 40%);">-cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span style="color: hsl(0, 100%, 40%);">-#start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+#start_testsuite virtphy</span><br><span> </span><br><span> # 3) OML tests require us to run without BSC</span><br><span> docker container kill ${BUILD_TAG}-bsc</span><br><span>@@ -156,21 +162,19 @@</span><br><span> start_fake_trx</span><br><span> start_trxcon</span><br><span> # ... and execute the testsuite again with different cfg</span><br><span style="color: hsl(0, 100%, 40%);">-cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span style="color: hsl(0, 100%, 40%);">-start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite oml</span><br><span> </span><br><span> # 4) Frequency hopping tests require different configuration files</span><br><span style="color: hsl(0, 100%, 40%);">-cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span> cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</span><br><span> cp osmo-bts.cfg $VOL_BASE_DIR/bts/</span><br><span> # restart the BSC/BTS and run the testsuite again</span><br><span> docker container kill ${BUILD_TAG}-bts</span><br><span> start_bsc</span><br><span> start_bts trx 0</span><br><span style="color: hsl(0, 100%, 40%);">-start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite hopping</span><br><span> # rename the test results, so they appear as 'BTS_Tests:hopping' in Jenkins</span><br><span> sed -i "s#classname='BTS_Tests'#classname='BTS_Tests:hopping'#g" \</span><br><span style="color: hsl(0, 100%, 40%);">- $VOL_BASE_DIR/bts-tester/junit-xml-hopping-*.log</span><br><span style="color: hsl(120, 100%, 40%);">+ $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log</span><br><span> </span><br><span> echo Stopping containers</span><br><span> docker container kill ${BUILD_TAG}-trxcon</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19623">change 19623</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/19623"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7c41cfb395047433e22e9c65c8c00ae284717b32 </div>
<div style="display:none"> Gerrit-Change-Number: 19623 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>