fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email )
Change subject: fixup: ttcn3-bts-test: use an older version of fake_trx.py ......................................................................
fixup: ttcn3-bts-test: use an older version of fake_trx.py
Setting OSMO_BB_BRANCH=ttcn3-bts-test did not achieve the goal, because it was not consumed by the osmocom-bb-host-master's Makefile. Setting it in jenkins.sh does the trick.
Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7 Fixes: 8540ae7 ("ttcn3-bts-test: use an older version of fake_trx.py") --- M ttcn3-bts-test/Makefile M ttcn3-bts-test/jenkins.sh 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/40043/1
diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile index 2af27a9..26ac873 100644 --- a/ttcn3-bts-test/Makefile +++ b/ttcn3-bts-test/Makefile @@ -1,7 +1,3 @@ -# XXX: use an older version of fake_trx.py, that predates -# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672). -OSMO_BB_BRANCH=ttcn3-bts-test - include ../make/Makefile
CFG_SRC_FILES = \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 1bb92d8..edb7030 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -2,6 +2,10 @@ TEST_CONFIGS_ALL="generic virtphy oml hopping" TEST_CONFIGS="${TEST_CONFIGS:-"generic oml hopping"}"
+# XXX: use an older version of fake_trx.py, that predates +# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672). +export OSMO_BB_BRANCH=ttcn3-bts-test + . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" # NOTE: there is no osmocom-bb-host-latest, hence always use master!