From b81b6181e013e53764075a55160603e65ea05196 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 3 Feb 2021 13:58:43 +0100
Subject: [PATCH] CI: migrating to oairu target on RRU machines
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/ran.py | 14 +++++++++-----
ci-scripts/xml_files/multi_rru_band38_build.xml | 10 +++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 774d7f19c6a..4d5c608bbe7 100644
--- a/ci-scripts/ran.py
+++ b/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:
diff --git a/ci-scripts/xml_files/multi_rru_band38_build.xml b/ci-scripts/xml_files/multi_rru_band38_build.xml
index ba45eab10a3..1370a3a3962 100644
--- a/ci-scripts/xml_files/multi_rru_band38_build.xml
+++ b/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>
--
GitLab