Merge remote-tracking branch 'origin/ci_hotfix_module_ue_ip_address' into integration_2021_wk20_a

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)
@@ -1733,10 +1732,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
@@ -2620,10 +2619,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)
 
 
 

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 ../