Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu

ci-scripts/ran.py

@@ -127,12 +127,16 @@ class RANManagement():
 		result = re.search('--eNBocp', self.Build_eNB_args)
 		if result is not None:
 			self.air_interface[self.eNB_instance] = 'ocp-enb'
-		else:	
-			result = re.search('--gNB', self.Build_eNB_args)
+		else:
+			result = re.search('--RU', self.Build_eNB_args)
 			if result is not None:
-				self.air_interface[self.eNB_instance] = 'nr-softmodem'
+				self.air_interface[self.eNB_instance] = 'oairu'
 			else:
-				self.air_interface[self.eNB_instance] = 'lte-softmodem'
+				result = re.search('--gNB', self.Build_eNB_args)
+				if result is not None:
+					self.air_interface[self.eNB_instance] = 'nr-softmodem'
+				else:
+					self.air_interface[self.eNB_instance] = 'lte-softmodem'
 		
 		# Worakround for some servers, we need to erase completely the workspace
 		if self.Build_eNB_forced_workspace_cleanup:
@@ -293,7 +297,7 @@ class RANManagement():
 				mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
 				mySSH.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5)
 				#-qq quiet / -u update orcreate files
-				mySSH.command('unzip -u -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5)
+				mySSH.command('unzip -o -u -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5)
 				mySSH.command('rm -f tmp_build' + testcaseId + '.zip', '\$', 5)
 				mySSH.close()
 		else:

ci-scripts/reportTestLocally.sh

@@ -309,14 +309,14 @@ function report_test {
                     NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
                     NB_UE_GOT_SYNC=`egrep -c "got sync" $UE_LOG`
                     NB_ENB_SYNCED_WITH_UE=`egrep -c "got UE capabilities for UE" $ENB_LOG`
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ] && [ $NB_UE_GOT_SYNC -eq 2 ] && [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
+                    if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -eq 2 ] && [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
                     then
                         echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
                     else
                         echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
                     fi
                     echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ]
+                    if [ $NB_ENB_GOT_SYNC -gt 0 ]
                     then
                         echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
                     else

ci-scripts/xml_files/multi_rru_band38_build.xml

@@ -26,7 +26,7 @@
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
  010101 010102 010103
- 000101 000102 000103
+ 000102 000103 000101
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
@@ -50,7 +50,7 @@
 	<testCase id="010102">
 		<class>Build_eNB</class>
 		<desc>Build Master RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --RU --ninja</Build_eNB_args>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 		<backgroundBuild>True</backgroundBuild>
@@ -59,7 +59,7 @@
 	<testCase id="000102">
 		<class>WaitEndBuild_eNB</class>
 		<desc>Wait for end of Build Master RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --RU --ninja</Build_eNB_args>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 	</testCase>
@@ -67,7 +67,7 @@
 	<testCase id="010103">
 		<class>Build_eNB</class>
 		<desc>Build Slave RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --RU --ninja</Build_eNB_args>
 		<eNB_instance>2</eNB_instance>
 		<eNB_serverId>2</eNB_serverId>
 		<backgroundBuild>True</backgroundBuild>
@@ -76,7 +76,7 @@
 	<testCase id="000103">
 		<class>WaitEndBuild_eNB</class>
 		<desc>Wait for end of Build Slave RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --RU --ninja</Build_eNB_args>
 		<eNB_instance>2</eNB_instance>
 		<eNB_serverId>2</eNB_serverId>
 	</testCase>