remove osmo-bts-omldummy container, it's now part of osmo-bts-master

5 files changed, 1 insertions, 65 deletions

diff --git a/osmo-bts-omldummy/.release b/osmo-bts-omldummy/.release
deleted file mode 100644
index 5b39bad..0000000
--- a/osmo-bts-omldummy/.release
+++ /dev/null
@@ -1,2 +0,0 @@
-release=0.0.0
-tag=osmo-bts-omldummy-0.0.0
diff --git a/osmo-bts-omldummy/Dockerfile b/osmo-bts-omldummy/Dockerfile
deleted file mode 100644
index 5aa9238..0000000
--- a/osmo-bts-omldummy/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM laforge/debian-jessie-build
-
-MAINTAINER Harald Welte <laforge@gnumonks.org>
-
-ARG	OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/"
-
-COPY	Release.key /tmp/Release.key
-
-RUN	apt-key add /tmp/Release.key && \
-	rm /tmp/Release.key && \
-	echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list
-
-ADD	$OSMOCOM_REPO/Release /tmp/Release
-RUN	apt-get update && \
-	apt-get install -y --no-install-recommends \
-		telnet \
-		libosmocore-dev \
-		libosmo-abis-dev \
-		libosmo-netif-dev \
-		libosmo-sccp-dev \
-		libsmpp34-dev \
-		libgtp-dev && \
-	apt-get clean
-
-WORKDIR	/tmp
-
-RUN	git clone git://git.osmocom.org/osmo-bts.git
-ADD	http://git.osmocom.org/osmo-bts/patch /tmp/commit-osmo-bts
-
-RUN	cd osmo-bts && \
-	git fetch && git checkout -f -B omldummy origin/laforge/omldummy && \
-	autoreconf -fi && \
-	./configure && \
-	make -j8 install
-
-WORKDIR	/tmp/osmo-bts/src/osmo-bts-omldummy
-CMD	["./respawn.sh", "127.0.0.1", "1234"]]
-
-#EXPOSE	
diff --git a/osmo-bts-omldummy/Makefile b/osmo-bts-omldummy/Makefile
deleted file mode 100644
index 80ae1f3..0000000
--- a/osmo-bts-omldummy/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
-
-include ../make/Makefile
diff --git a/osmo-bts-omldummy/Release.key b/osmo-bts-omldummy/Release.key
deleted file mode 100644
index e656238..0000000
--- a/osmo-bts-omldummy/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc
-aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI
-ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw
-8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI
-L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb
-/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I
-ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi
-8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=Gvly
------END PGP PUBLIC KEY BLOCK-----
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 62aa7b1..b55230a 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -32,7 +32,7 @@ for i in `seq 0 2`; do
 	docker run	--rm \
 			--network $NET_NAME --ip 172.18.2.10$i \
 			--name ${BUILD_TAG}-bts$i -d \
-			$REPO_USER/osmo-bts-omldummy ./respawn.sh 172.18.2.20 $((i + 1234)) 1
+			$REPO_USER/osmo-bts-master ./respawn.sh 172.18.2.20 $((i + 1234)) 1
 done
 
 echo Starting container with BSC testsuite