aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2018-08-08 04:23:20 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2018-08-08 05:13:49 +0700
commitfbb5366dee3bc7fb689f25a84ec08258ee23e275 (patch)
treef10b467a49313cef2ea57455dc9a6df648e7f156
parent2d713c2883ffc721202cea2c8e250cc655b5a83f (diff)
Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master'
At the moment, this Docker image does contain not only trxcon, but also FakeTRX, virt_phy, and other host applications, so let's name it properly... Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb
-rw-r--r--Makefile8
-rw-r--r--osmocom-bb-host-master/.release2
-rw-r--r--osmocom-bb-host-master/Dockerfile (renamed from osmocom-bb-trxcon/Dockerfile)0
-rw-r--r--osmocom-bb-host-master/Makefile (renamed from osmocom-bb-trxcon/Makefile)0
-rw-r--r--osmocom-bb-host-master/Release.key (renamed from osmocom-bb-trxcon/Release.key)0
-rw-r--r--osmocom-bb-trxcon/.release2
-rwxr-xr-xttcn3-bts-test/jenkins.sh4
7 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index eca64be..2cdbc58 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,9 @@ osmo-msc-master: debian-jessie-build
osmo-stp-master: debian-jessie-build
$(MAKE) -C osmo-stp-master
-.PHONY: osmocom-bb-trxcon
-osmocom-bb-trxcon: debian-jessie-build
- $(MAKE) -C osmocom-bb-trxcon
+.PHONY: osmocom-bb-host-master
+osmocom-bb-host-master: debian-jessie-build
+ $(MAKE) -C osmocom-bb-host-master
.PHONY: osmo-ggsn-master
osmo-ggsn-master: debian-jessie-build
@@ -38,7 +38,7 @@ ttcn3-bsc-test: debian-stretch-titan osmo-stp-master osmo-bsc-master osmo-bts-ma
$(MAKE) -C ttcn3-bsc-test
.PHONY: ttcn3-bts-test
-ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-trxcon ttcn3-bts-test
+ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test
$(MAKE) -C ttcn3-bts-test
.PHONY: ttcn3-msc-test
diff --git a/osmocom-bb-host-master/.release b/osmocom-bb-host-master/.release
new file mode 100644
index 0000000..0432acd
--- /dev/null
+++ b/osmocom-bb-host-master/.release
@@ -0,0 +1,2 @@
+release=0.0.0
+tag=osmocom-bb-host-master-0.0.0
diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-host-master/Dockerfile
index 19cc772..19cc772 100644
--- a/osmocom-bb-trxcon/Dockerfile
+++ b/osmocom-bb-host-master/Dockerfile
diff --git a/osmocom-bb-trxcon/Makefile b/osmocom-bb-host-master/Makefile
index 0895788..0895788 100644
--- a/osmocom-bb-trxcon/Makefile
+++ b/osmocom-bb-host-master/Makefile
diff --git a/osmocom-bb-trxcon/Release.key b/osmocom-bb-host-master/Release.key
index e656238..e656238 100644
--- a/osmocom-bb-trxcon/Release.key
+++ b/osmocom-bb-host-master/Release.key
diff --git a/osmocom-bb-trxcon/.release b/osmocom-bb-trxcon/.release
deleted file mode 100644
index a6e882a..0000000
--- a/osmocom-bb-trxcon/.release
+++ /dev/null
@@ -1,2 +0,0 @@
-release=0.0.0
-tag=osmocombb-bb-trxcon-0.0.0
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index e8c77f3..1cd06e7 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -38,7 +38,7 @@ echo Starting container with fake_trx
docker run --rm \
--network $NET_NAME --ip 172.18.9.21 \
--name ${BUILD_TAG}-fake_trx -d \
- $REPO_USER/osmocom-bb-trxcon \
+ $REPO_USER/osmocom-bb-host-master \
/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22
echo Starting container with trxcon
@@ -46,7 +46,7 @@ docker run --rm \
--network $NET_NAME --ip 172.18.9.22 \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-trxcon -d \
- $REPO_USER/osmocom-bb-trxcon \
+ $REPO_USER/osmocom-bb-host-master \
/usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2