From bee7e57b4b78044a7b35db3807ee90127120def0 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 17 May 2021 14:55:20 +0200 Subject: [PATCH 1/2] RHEL8-UHD support: revert back to 4.0.0.0 version Signed-off-by: Raphael Defosseux --- cmake_targets/tools/build_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index fb3f2e7b9a..30fdb7eb1e 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -321,7 +321,7 @@ install_usrp_uhd_driver_from_source(){ rm -rf /tmp/uhd git clone https://github.com/EttusResearch/uhd.git cd uhd - git checkout tags/v3.14.0.0 + git checkout tags/v4.0.0.0 mkdir -p host/build cd host/build $CMAKE ../ From ff31beac07a6ed6f65c64afa2166573f15354a1a Mon Sep 17 00:00:00 2001 From: hardy Date: Mon, 17 May 2021 18:35:32 +0200 Subject: [PATCH 2/2] fixing test retry with different IP adresses assigned to module UE --- ci-scripts/cls_oaicitest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index e2851abc25..9880b5fbf6 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -392,7 +392,6 @@ class OaiCiTest(): status=Module_UE.GetModuleIPAddress() if status==0: HTML.CreateHtmlTestRow(Module_UE.UEIPAddress, 'OK', CONST.ALL_PROCESSES_OK) - self.UEIPAddresses.append(Module_UE.UEIPAddress) logging.debug('UE IP addresss : '+ Module_UE.UEIPAddress) else: #status==-1 failed to retrieve IP address HTML.CreateHtmlTestRow('N/A', 'KO', CONST.UE_IP_ADDRESS_ISSUE) @@ -1732,10 +1731,10 @@ class OaiCiTest(): self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC) return else: + self.UEIPAddresses=[] Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id]) Module_UE.GetModuleIPAddress() - if Module_UE.UEIPAddress not in self.UEIPAddresses: - self.UEIPAddresses.append(Module_UE.UEIPAddress) + self.UEIPAddresses.append(Module_UE.UEIPAddress) logging.debug(self.UEIPAddresses) multi_jobs = [] i = 0 @@ -2597,10 +2596,10 @@ class OaiCiTest(): self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC) return else: #is a module + self.UEIPAddresses=[] Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id]) Module_UE.GetModuleIPAddress() - if Module_UE.UEIPAddress not in self.UEIPAddresses: - self.UEIPAddresses.append(Module_UE.UEIPAddress) + self.UEIPAddresses.append(Module_UE.UEIPAddress)