osmith has uploaded this change for review.
testenv: use new osmocom-bb binary packages
When using --binary-packages, use the osmocom-bb-trxcon etc. binary
packages that are now available, instead of only installing the
dependencies as binary packages and building these components from
source.
Change-Id: I072ea55d12060b4ef04ee9775ef116d553090e9a
---
M _testenv/testenv/podman_install.py
M bts/run_fake_trx.sh
M bts/testenv_generic.cfg
M bts/testenv_hopping.cfg
M bts/testenv_oml.cfg
5 files changed, 8 insertions(+), 63 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/39061/1
diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py
index 9033c14..2c5ae5a 100644
--- a/_testenv/testenv/podman_install.py
+++ b/_testenv/testenv/podman_install.py
@@ -11,25 +11,16 @@
import testenv.podman
git_dir = None
-bb_dir = None
-trxcon_dir = None
-virtphy_dir = None
sccp_dir = None
jobs = None
def init():
global git_dir
- global bb_dir
- global trxcon_dir
- global virtphy_dir
global sccp_dir
global jobs
git_dir = os.path.join(testenv.args.cache, "git")
- bb_dir = os.path.join(git_dir, "osmocom-bb")
- trxcon_dir = os.path.join(bb_dir, "src/host/trxcon")
- virtphy_dir = os.path.join(bb_dir, "src/host/virt_phy")
sccp_dir = os.path.join(git_dir, "libosmo-sigtran")
jobs = multiprocessing.cpu_count() + 1
@@ -101,24 +92,6 @@
testenv.cmd.run(["apt-get", "-q", "install", "-y", "--no-install-recommends"] + pkgs)
-def clone_osmocom_bb():
- if os.path.exists(bb_dir):
- logging.debug("osmocom-bb: already cloned")
- return
-
- testenv.cmd.run(
- [
- "git",
- "-C",
- git_dir,
- "clone",
- "--depth",
- "1",
- "https://gerrit.osmocom.org/osmocom-bb",
- ]
- )
-
-
def clone_libosmo_sigtran():
if os.path.exists(sccp_dir):
logging.debug("libosmo-sigtran: already cloned")
@@ -137,34 +110,6 @@
)
-def from_source_trxcon():
- trxcon_in_srcdir = os.path.join(trxcon_dir, "src/trxcon")
-
- if not os.path.exists(trxcon_in_srcdir):
- clone_osmocom_bb()
- apt_install(["libosmocore-dev"])
- logging.info("Building trxcon")
- testenv.cmd.run(["autoreconf", "-fi"], cwd=trxcon_dir)
- testenv.cmd.run(["./configure"], cwd=trxcon_dir)
- testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=trxcon_dir)
-
- testenv.cmd.run(["ln", "-s", trxcon_in_srcdir, "/usr/local/bin/trxcon"])
-
-
-def from_source_virtphy():
- virtphy_in_srcdir = os.path.join(virtphy_dir, "src/virtphy")
-
- if not os.path.exists(virtphy_in_srcdir):
- clone_osmocom_bb()
- apt_install(["libosmocore-dev"])
- logging.info("Building virtphy")
- testenv.cmd.run(["autoreconf", "-fi"], cwd=virtphy_dir)
- testenv.cmd.run(["./configure"], cwd=virtphy_dir)
- testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=virtphy_dir)
-
- testenv.cmd.run(["ln", "-s", virtphy_in_srcdir, "/usr/local/bin/virtphy"])
-
-
def from_source_sccp_demo_user():
sccp_demo_user_path = os.path.join(sccp_dir, "examples/sccp_demo_user")
@@ -196,12 +141,6 @@
def from_source(cfg, cfg_name, section):
program = cfg[section]["program"].split(" ", 1)[0]
- if program == "trxcon":
- return from_source_trxcon()
- if program == "virtphy":
- return from_source_virtphy()
- if program == "run_fake_trx.sh":
- return clone_osmocom_bb()
if program == "run_sccp_demo_user.sh":
return from_source_sccp_demo_user()
diff --git a/bts/run_fake_trx.sh b/bts/run_fake_trx.sh
index 860dec7..a1d869e 100755
--- a/bts/run_fake_trx.sh
+++ b/bts/run_fake_trx.sh
@@ -3,8 +3,8 @@
# fake trx is part of osmo-trx
if [ "$TESTENV_BINARY_REPO" = 1 ]; then
- # testenv with --binary-repo -> osmocom-bb cloned separately
- FAKE_TRX_DIR="$TESTENV_GIT_DIR"/osmocom-bb/src/target/trx_toolkit
+ # 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
diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg
index f33e616..34a39dc 100644
--- a/bts/testenv_generic.cfg
+++ b/bts/testenv_generic.cfg
@@ -11,10 +11,12 @@
[fake-trx]
program=run_fake_trx.sh
make=.make.osmocom-bb.clone
+package=osmocom-bb-trx-toolkit
[trxcon]
program=trxcon
make=trxcon
+package=osmocom-bb-trxcon
[bts]
program=respawn.sh osmo-bts-trx
diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg
index 5adf485..a97c050 100644
--- a/bts/testenv_hopping.cfg
+++ b/bts/testenv_hopping.cfg
@@ -14,10 +14,12 @@
[fake-trx]
program=run_fake_trx.sh
make=.make.osmocom-bb.clone
+package=osmocom-bb-trx-toolkit
[trxcon]
program=trxcon
make=trxcon
+package=osmocom-bb-trxcon
[bts]
program=respawn.sh osmo-bts-trx
diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg
index 77a6fda..d6354fd 100644
--- a/bts/testenv_oml.cfg
+++ b/bts/testenv_oml.cfg
@@ -5,10 +5,12 @@
[fake-trx]
program=run_fake_trx.sh
make=.make.osmocom-bb.clone
+package=osmocom-bb-trx-toolkit
[trxcon]
program=trxcon
make=trxcon
+package=osmocom-bb-trxcon
[bts]
prepare=osmo-config-merge osmo-bts.cfg osmo-bts-oml.confmerge > osmo-bts-oml.cfg
To view, visit change 39061. To unsubscribe, or for help writing mail filters, visit settings.