From 3d365b0d8ef46905b8fedf05a1485f3b65bf54f9 Mon Sep 17 00:00:00 2001
From: Remi Hardy <remi.hardy@openairinterface.org>
Date: Tue, 21 Jul 2020 17:04:23 +0200
Subject: [PATCH] WIP fr1 set up
---
ci-scripts/cls_cots_ue.py | 4 ++--
ci-scripts/ran.py | 3 ++-
ci-scripts/xml_files/fr1_multi_node_build.xml | 20 ++++++++-----------
ci-scripts/xml_files/fr1_toggle_cots_ue.xml | 4 ++--
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ci-scripts/cls_cots_ue.py b/ci-scripts/cls_cots_ue.py
index 3e4c8179a86..23feba982b3 100644
--- a/ci-scripts/cls_cots_ue.py
+++ b/ci-scripts/cls_cots_ue.py
@@ -78,8 +78,8 @@ class CotsUe:
current_state = self.Check_Airplane()
retry+=1
if current_state != target_state:
- print("ATTENTION : Could not toggle to : "+target_state_str)
- print("Current state is : "+ str(current_state))
+ logging.error("ATTENTION : Could not toggle to : "+target_state_str)
+ logging.error("Current state is : "+ str(current_state))
else:
print("Airplane mode is already "+ target_state_str)
mySSH.command('sudo ./adb kill-server','$',5)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 5673b4c0828..6ebecec8436 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -431,7 +431,8 @@ class RANManagement():
os.remove('./tmp_build' + testcaseId + '.zip')
mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
mySSH.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5)
- mySSH.command('unzip -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5)
+ #-qq quiet / -u update orcreate files
+ mySSH.command('unzip -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/fr1_multi_node_build.xml b/ci-scripts/xml_files/fr1_multi_node_build.xml
index b2c0daa74e4..579eef27a82 100644
--- a/ci-scripts/xml_files/fr1_multi_node_build.xml
+++ b/ci-scripts/xml_files/fr1_multi_node_build.xml
@@ -25,41 +25,37 @@
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
- 010101 010102
- 000101 000102
+ 000001 000002
+ 000003 000004
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
- <testCase id="010101">
+ <testCase id="000001">
<class>Build_eNB</class>
<desc>Build eNB</desc>
- <Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+ <Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
<eNB_instance>0</eNB_instance>
<eNB_serverId>0</eNB_serverId>
- <backgroundBuild>True</backgroundBuild>
</testCase>
- <testCase id="000101">
+ <testCase id="000002">
<class>WaitEndBuild_eNB</class>
<desc>Wait for end of Build eNB</desc>
- <Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
<eNB_instance>0</eNB_instance>
<eNB_serverId>0</eNB_serverId>
</testCase>
- <testCase id="010102">
+ <testCase id="000003">
<class>Build_eNB</class>
<desc>Build gNB</desc>
- <Build_eNB_args>-w USRP -c --gNB --ninja</Build_eNB_args>
+ <Build_eNB_args>-w USRP -c --gNB</Build_eNB_args>
<eNB_instance>1</eNB_instance>
<eNB_serverId>1</eNB_serverId>
- <backgroundBuild>True</backgroundBuild>
</testCase>
- <testCase id="000102">
+ <testCase id="000004">
<class>WaitEndBuild_eNB</class>
<desc>Wait for end of Build gNB</desc>
- <Build_eNB_args>-w USRP -c --gNB --ninja</Build_eNB_args>
<eNB_instance>1</eNB_instance>
<eNB_serverId>1</eNB_serverId>
</testCase>
diff --git a/ci-scripts/xml_files/fr1_toggle_cots_ue.xml b/ci-scripts/xml_files/fr1_toggle_cots_ue.xml
index 371063c791e..ee4d36f00a6 100644
--- a/ci-scripts/xml_files/fr1_toggle_cots_ue.xml
+++ b/ci-scripts/xml_files/fr1_toggle_cots_ue.xml
@@ -25,11 +25,11 @@
<htmlTabName>Airplane</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList>
- 010101
+ 010000
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
- <testCase id="010101">
+ <testCase id="010000">
<class>COTS_UE_Airplane</class>
<desc>Toggle COTS Airplane mode ON</desc>
<cots_ue_airplane_args>ON</cots_ue_airplane_args>
--
GitLab