From e921995ce7966826a16709548a62b24e59cd698b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 25 May 2020 20:04:52 +0200 Subject: [PATCH] epc_{amarisoft,srs}: Support selecting tgz based on run_node's run label Change-Id: I90b8dab8bdc9980a7d2486d890cff183c07f1809 --- src/osmo_gsm_tester/obj/epc_amarisoft.py | 2 +- src/osmo_gsm_tester/obj/epc_srs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py index d6cad813..40216f70 100644 --- a/src/osmo_gsm_tester/obj/epc_amarisoft.py +++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py @@ -59,7 +59,7 @@ class AmarisoftEPC(epc.EPC): 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): diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py index 2ee486f6..e1d9f59c 100644 --- a/src/osmo_gsm_tester/obj/epc_srs.py +++ b/src/osmo_gsm_tester/obj/epc_srs.py @@ -118,7 +118,7 @@ class srsEPC(epc.EPC): 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):