This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has submitted this change and it was merged. Change subject: contrib: Build octphy osmo-bts variant and make it generic ...................................................................... contrib: Build octphy osmo-bts variant and make it generic This is a first step to add support for osmo-bts-octpy to osmo-gsm-tester. There's no point in building separate insts for different osmo-bts variants which run on the main unit and which come from the same git repository, this we make the osmo-bts-trx one generic to handle all variants which fall into the description above. Tested locally on my laptop that it builds susccessfully. Once this patch is applied, jenkins jobs need to be adjusted: - RnD: osmo-gsm-tester_manual-build-all - Prod: osmo-gsm-tester_build-osmo-bts-trx (and rename it) Change-Id: Ib8814e4ce49596b586990f20d7d625a719852e90 --- R contrib/jenkins-build-osmo-bts.sh M src/osmo_gsm_tester/bts_osmotrx.py 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-bts-trx.sh b/contrib/jenkins-build-osmo-bts.sh similarity index 61% rename from contrib/jenkins-build-osmo-bts-trx.sh rename to contrib/jenkins-build-osmo-bts.sh index 6188be1..7349ce5 100755 --- a/contrib/jenkins-build-osmo-bts-trx.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -1,14 +1,15 @@ #!/bin/sh set -e -x base="$PWD" -name="osmo-bts-trx" +name="osmo-bts" . "$(dirname "$0")/jenkins-build-common.sh" # for gsm_data_shared.* have_repo openbsc +have_repo octphy-2g-headers build_repo libosmocore --disable-doxygen build_repo libosmo-abis -build_repo osmo-bts --enable-trx --with-openbsc=$base/openbsc/openbsc/include +build_repo osmo-bts --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers -create_bin_tgz osmo-bts-trx +create_bin_tgz osmo-bts-trx osmo-bts-octphy diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 6130ca9..f53b8a3 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -84,7 +84,7 @@ self.log('Waiting for osmo-trx to start up...') event_loop.wait(self, self.trx.trx_ready) - self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(OsmoBtsTrx.BIN_BTS_TRX))) + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts'))) lib = self.inst.child('lib') if not os.path.isdir(lib): raise RuntimeError('No lib/ in %r' % self.inst) -- To view, visit https://gerrit.osmocom.org/3928 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib8814e4ce49596b586990f20d7d625a719852e90 Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>