commit eddff7c03cfc8342e69002bff7586998283da962
author Pau Espin Pedrol <pespin@sysmocom.de> Tue May 26 13:55:19 2020 +0200
committer pespin <pespin@sysmocom.de> Thu May 28 13:13:05 2020 +0000
tree 62c44cba6b272aa1bafbc70c1b3402abbe5814cf
parent b452ed6db14dd9fc1ab8543c41f89641ee4f5771

ms_{srs,amarisoft}: Support selecting tgz based on run_node's run label

Change-Id: I2c4cab02fa34c7acc7e57c3fec5a42c26d2a9208

src/osmo_gsm_tester/obj/ms_amarisoft.py

diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py
index 5067048..e99cca3 100644
--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py
@@ -108,7 +108,7 @@
         if self._bin_prefix is None:
             self._bin_prefix = os.getenv('AMARISOFT_PATH_UE', None)
             if self._bin_prefix == None:
-                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftue')
+                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftue', self._run_node.run_label())
         return self._bin_prefix
 
     def cleanup(self):

src/osmo_gsm_tester/obj/ms_srs.py

diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index 1efa7c1..f53f461 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -198,7 +198,7 @@
         self.process.launch()
 
     def configure(self):
-        self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('srslte')))
+        self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('srslte', self._run_node.run_label())))
         if not os.path.isdir(self.inst.child('lib')):
             raise log.Error('No lib/ in', self.inst)
         if not self.inst.isfile('bin', srsUE.BINFILE):