<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10394">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master'<br><br>At the moment, this Docker image does contain not only trxcon,<br>but also FakeTRX, virt_phy, and other host applications, so<br>let's name it properly...<br><br>Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb<br>---<br>M Makefile<br>A osmocom-bb-host-master/.release<br>R osmocom-bb-host-master/Dockerfile<br>R osmocom-bb-host-master/Makefile<br>R osmocom-bb-host-master/Release.key<br>D osmocom-bb-trxcon/.release<br>M ttcn3-bts-test/jenkins.sh<br>7 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile b/Makefile</span><br><span>index eca64be..2cdbc58 100644</span><br><span>--- a/Makefile</span><br><span>+++ b/Makefile</span><br><span>@@ -25,9 +25,9 @@</span><br><span> osmo-stp-master: debian-jessie-build</span><br><span> $(MAKE) -C osmo-stp-master</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-.PHONY: osmocom-bb-trxcon</span><br><span style="color: hsl(0, 100%, 40%);">-osmocom-bb-trxcon: debian-jessie-build</span><br><span style="color: hsl(0, 100%, 40%);">- $(MAKE) -C osmocom-bb-trxcon</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: osmocom-bb-host-master</span><br><span style="color: hsl(120, 100%, 40%);">+osmocom-bb-host-master: debian-jessie-build</span><br><span style="color: hsl(120, 100%, 40%);">+ $(MAKE) -C osmocom-bb-host-master</span><br><span> </span><br><span> .PHONY: osmo-ggsn-master</span><br><span> osmo-ggsn-master: debian-jessie-build</span><br><span>@@ -38,7 +38,7 @@</span><br><span> $(MAKE) -C ttcn3-bsc-test</span><br><span> </span><br><span> .PHONY: ttcn3-bts-test</span><br><span style="color: hsl(0, 100%, 40%);">-ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-trxcon ttcn3-bts-test</span><br><span style="color: hsl(120, 100%, 40%);">+ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test</span><br><span> $(MAKE) -C ttcn3-bts-test</span><br><span> </span><br><span> .PHONY: ttcn3-msc-test</span><br><span>diff --git a/osmocom-bb-host-master/.release b/osmocom-bb-host-master/.release</span><br><span>new file mode 100644</span><br><span>index 0000000..0432acd</span><br><span>--- /dev/null</span><br><span>+++ b/osmocom-bb-host-master/.release</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+release=0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+tag=osmocom-bb-host-master-0.0.0</span><br><span>diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>similarity index 100%</span><br><span>rename from osmocom-bb-trxcon/Dockerfile</span><br><span>rename to osmocom-bb-host-master/Dockerfile</span><br><span>diff --git a/osmocom-bb-trxcon/Makefile b/osmocom-bb-host-master/Makefile</span><br><span>similarity index 100%</span><br><span>rename from osmocom-bb-trxcon/Makefile</span><br><span>rename to osmocom-bb-host-master/Makefile</span><br><span>diff --git a/osmocom-bb-trxcon/Release.key b/osmocom-bb-host-master/Release.key</span><br><span>similarity index 100%</span><br><span>rename from osmocom-bb-trxcon/Release.key</span><br><span>rename to osmocom-bb-host-master/Release.key</span><br><span>diff --git a/osmocom-bb-trxcon/.release b/osmocom-bb-trxcon/.release</span><br><span>deleted file mode 100644</span><br><span>index a6e882a..0000000</span><br><span>--- a/osmocom-bb-trxcon/.release</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-release=0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-tag=osmocombb-bb-trxcon-0.0.0</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index e8c77f3..1cd06e7 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -38,7 +38,7 @@</span><br><span> docker run --rm \</span><br><span> --network $NET_NAME --ip 172.18.9.21 \</span><br><span> --name ${BUILD_TAG}-fake_trx -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmocom-bb-trxcon \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmocom-bb-host-master \</span><br><span> /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22</span><br><span> </span><br><span> echo Starting container with trxcon</span><br><span>@@ -46,7 +46,7 @@</span><br><span> --network $NET_NAME --ip 172.18.9.22 \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-trxcon -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmocom-bb-trxcon \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmocom-bb-host-master \</span><br><span> /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10394">change 10394</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/10394"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb </div>
<div style="display:none"> Gerrit-Change-Number: 10394 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>