commit e921995ce7966826a16709548a62b24e59cd698b
author Pau Espin Pedrol <pespin@sysmocom.de> Mon May 25 20:04:52 2020 +0200
committer pespin <pespin@sysmocom.de> Thu May 28 13:13:05 2020 +0000
tree 20349181070178272b47b63cf0d05616f5a1bbed
parent 6e0b6fb0747b045e97e915e9ff9aeeb80c4c7f40

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

Change-Id: I90b8dab8bdc9980a7d2486d890cff183c07f1809

src/osmo_gsm_tester/obj/epc_amarisoft.py

diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py
index d6cad81..40216f7 100644
--- a/src/osmo_gsm_tester/obj/epc_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py
@@ -59,7 +59,7 @@
         if self._bin_prefix is None:
             self._bin_prefix = os.getenv('AMARISOFT_PATH_EPC', None)
             if self._bin_prefix == None:
-                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftepc')
+                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftepc', self._run_node.run_label())
         return self._bin_prefix
 
     def cleanup(self):

src/osmo_gsm_tester/obj/epc_srs.py

diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py
index 2ee486f..e1d9f59 100644
--- a/src/osmo_gsm_tester/obj/epc_srs.py
+++ b/src/osmo_gsm_tester/obj/epc_srs.py
@@ -118,7 +118,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', srsEPC.BINFILE):