<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26681">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-bts-test: move generic config files into a directory<br><br>Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2<br>---<br>M ttcn3-bts-test/Makefile<br>R ttcn3-bts-test/generic/BTS_Tests.cfg<br>R ttcn3-bts-test/generic/osmo-bsc.confmerge<br>R ttcn3-bts-test/generic/osmo-bts.confmerge<br>M ttcn3-bts-test/jenkins.sh<br>5 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/26681/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile</span><br><span>index 19154b8..2d3335f 100644</span><br><span>--- a/ttcn3-bts-test/Makefile</span><br><span>+++ b/ttcn3-bts-test/Makefile</span><br><span>@@ -8,8 +8,8 @@</span><br><span>        osmo-bsc.src.cfg</span><br><span> </span><br><span> CFG_GEN_FILES = \</span><br><span style="color: hsl(0, 100%, 40%);">-       osmo-bts-generic.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo-bsc-generic.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        generic/osmo-bts.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        generic/osmo-bsc.cfg \</span><br><span>       virtphy/osmo-bts.cfg \</span><br><span>       oml/osmo-bts.cfg \</span><br><span>   fh/osmo-bsc.cfg</span><br><span>@@ -22,20 +22,20 @@</span><br><span> %src.cfg:</span><br><span>   wget $(CFG_SRC_FETCH_URL)/$(@:%.src.cfg=%.cfg) -O $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo-bts-generic.cfg: osmo-bts.src.cfg osmo-bts.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+generic/osmo-bts.cfg: osmo-bts.src.cfg generic/osmo-bts.confmerge</span><br><span>         osmo-config-merge $^ > $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo-bsc-generic.cfg: osmo-bsc.src.cfg osmo-bsc.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+generic/osmo-bsc.cfg: osmo-bsc.src.cfg generic/osmo-bsc.confmerge</span><br><span>         osmo-config-merge $^ > $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-virtphy/osmo-bts.cfg: osmo-bts-generic.cfg virtphy/osmo-bts.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+virtphy/osmo-bts.cfg: generic/osmo-bts.cfg virtphy/osmo-bts.confmerge</span><br><span>         osmo-config-merge $^ > $@</span><br><span>         sed -i "/osmotrx/d" $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-oml/osmo-bts.cfg: osmo-bts-generic.cfg oml/osmo-bts.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+oml/osmo-bts.cfg: generic/osmo-bts.cfg oml/osmo-bts.confmerge</span><br><span>     osmo-config-merge $^ > $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-fh/osmo-bsc.cfg: osmo-bsc-generic.cfg fh/osmo-bsc.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+fh/osmo-bsc.cfg: generic/osmo-bsc.cfg fh/osmo-bsc.confmerge</span><br><span>     osmo-config-merge $^ > $@</span><br><span> </span><br><span> clean:</span><br><span>diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg</span><br><span>similarity index 100%</span><br><span>rename from ttcn3-bts-test/BTS_Tests.cfg</span><br><span>rename to ttcn3-bts-test/generic/BTS_Tests.cfg</span><br><span>diff --git a/ttcn3-bts-test/osmo-bsc.confmerge b/ttcn3-bts-test/generic/osmo-bsc.confmerge</span><br><span>similarity index 100%</span><br><span>rename from ttcn3-bts-test/osmo-bsc.confmerge</span><br><span>rename to ttcn3-bts-test/generic/osmo-bsc.confmerge</span><br><span>diff --git a/ttcn3-bts-test/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge</span><br><span>similarity index 100%</span><br><span>rename from ttcn3-bts-test/osmo-bts.confmerge</span><br><span>rename to ttcn3-bts-test/generic/osmo-bts.confmerge</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 201ce46..35ce0d5 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -120,7 +120,7 @@</span><br><span> network_create $SUBNET</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bts-tester-generic</span><br><span style="color: hsl(0, 100%, 40%);">-cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/</span><br><span style="color: hsl(120, 100%, 40%);">+cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/</span><br><span> write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"</span><br><span> mkdir $VOL_BASE_DIR/bts-tester-virtphy</span><br><span> cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/</span><br><span>@@ -136,11 +136,11 @@</span><br><span>    $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bsc</span><br><span style="color: hsl(0, 100%, 40%);">-cp osmo-bsc-generic.cfg $VOL_BASE_DIR/bsc/</span><br><span style="color: hsl(120, 100%, 40%);">+cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bts</span><br><span> mkdir $VOL_BASE_DIR/bts/unix</span><br><span style="color: hsl(0, 100%, 40%);">-cp osmo-bts-generic.cfg $VOL_BASE_DIR/bts/</span><br><span style="color: hsl(120, 100%, 40%);">+cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/unix</span><br><span> </span><br><span>@@ -182,7 +182,7 @@</span><br><span> </span><br><span> # 4) Frequency hopping tests require different configuration files</span><br><span> cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</span><br><span style="color: hsl(0, 100%, 40%);">-cp osmo-bts-generic.cfg $VOL_BASE_DIR/bts/</span><br><span style="color: hsl(120, 100%, 40%);">+cp generic/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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26681">change 26681</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/+/26681"/><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: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 </div>
<div style="display:none"> Gerrit-Change-Number: 26681 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>