osmith submitted this change.

View Change

bts: use osmo-dev to build osmo-trx-proxy, trxcon

Both test components are considered to be part of the testsuite and
shall always be built from source (current master in jenkins). Set
package=no to do this and remove legacy fake-trx code for latest that
was only kept because I had assumed we must install osmo-trx-proxy and
trxcon through binary packages.

Related: OS#6638#note-12
Depends: osmo-ci Id7521e9941f651608b39e8b7b2a6437a0e483022
Change-Id: Ifb6761b3fc15a29404dd0ea17b039fde30053d13
---
D bts/run_fake_trx.sh
M bts/testenv_generic.cfg
M bts/testenv_hopping.cfg
M bts/testenv_oml.cfg
4 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/bts/run_fake_trx.sh b/bts/run_fake_trx.sh
deleted file mode 100755
index a1d869e..0000000
--- a/bts/run_fake_trx.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Most BTS_Tests require to have fake_trx running.
-# fake trx is part of osmo-trx
-
-if [ "$TESTENV_BINARY_REPO" = 1 ]; then
-	# testenv with --binary-repo -> osmocom-bb-trx-toolkit package
-	FAKE_TRX_DIR="/usr/share/osmocom-bb/trx_toolkit"
-elif [ -n "$TESTENV_SRC_DIR" ]; then
-	# testenv without --binary-repo -> osmocom-bb cloned via osmo-dev
-	FAKE_TRX_DIR="$TESTENV_SRC_DIR"/osmocom-bb/src/target/trx_toolkit
-fi
-
-FAKE_TRX_DIR="${FAKE_TRX_DIR:-../../osmo-trx/osmocom-bb/src/target/trx_toolkit}"
-
-cd "$FAKE_TRX_DIR"
-exec ./fake_trx.py  --trx TRX1@127.0.0.1:5700/1 --trx TRX2@127.0.0.1:5700/2 --trx TRX3@127.0.0.1:5700/3
diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg
index 87831cd..4807d7f 100644
--- a/bts/testenv_generic.cfg
+++ b/bts/testenv_generic.cfg
@@ -12,17 +12,13 @@
 prepare=require_ulimit_r.sh 32
 program=osmo-trx-proxy
 make=osmo-trx
-package=osmo-trx-proxy
+package=no
 copy=osmo-trx-proxy.cfg
-# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released
-program_latest=run_fake_trx.sh
-make_latest=.make.osmocom-bb.clone
-package_latest=osmocom-bb-trx-toolkit
 
 [trxcon]
 program=trxcon
 make=trxcon
-package=osmocom-bb-trxcon
+package=no
 
 [bts]
 prepare=require_ulimit_r.sh 30
diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg
index b9fadc3..a7fba70 100644
--- a/bts/testenv_hopping.cfg
+++ b/bts/testenv_hopping.cfg
@@ -15,17 +15,13 @@
 prepare=require_ulimit_r.sh 32
 program=osmo-trx-proxy
 make=osmo-trx
-package=osmo-trx-proxy
+package=no
 copy=osmo-trx-proxy.cfg
-# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released
-program_latest=run_fake_trx.sh
-make_latest=.make.osmocom-bb.clone
-package_latest=osmocom-bb-trx-toolkit
 
 [trxcon]
 program=trxcon
 make=trxcon
-package=osmocom-bb-trxcon
+package=no
 
 [bts]
 prepare=require_ulimit_r.sh 30
diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg
index a7f561d..11d09e4 100644
--- a/bts/testenv_oml.cfg
+++ b/bts/testenv_oml.cfg
@@ -6,17 +6,13 @@
 prepare=require_ulimit_r.sh 32
 program=osmo-trx-proxy
 make=osmo-trx
-package=osmo-trx-proxy
+package=no
 copy=osmo-trx-proxy.cfg
-# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released
-program_latest=run_fake_trx.sh
-make_latest=.make.osmocom-bb.clone
-package_latest=osmocom-bb-trx-toolkit
 
 [trxcon]
 program=trxcon
 make=trxcon
-package=osmocom-bb-trxcon
+package=no
 
 [bts]
 prepare=osmo-config-merge osmo-bts.cfg osmo-bts-oml.confmerge > osmo-bts-oml.cfg && require_ulimit_r.sh 30

To view, visit change 43775. To unsubscribe, or for help writing mail filters, visit settings.