From 91480dccce68f740308c54be0ad7ae9c6d1d8b74 Mon Sep 17 00:00:00 2001
From: Remi Hardy <remi.hardy@openairinterface.org>
Date: Mon, 13 Jul 2020 15:17:54 +0200
Subject: [PATCH] support for ocp enb build and test (unit test ok)
---
ci-scripts/ran.py | 2 +-
.../xml_files/enb_ocp_usrp210_build.xml | 2 +-
ci-scripts/xml_files/fr1_multi_node_build.xml | 67 +++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)
create mode 100644 ci-scripts/xml_files/fr1_multi_node_build.xml
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 93ba8599030..e09ce55634a 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -440,7 +440,7 @@ class RANManagement():
logging.info('\u001B[1m Building OAI ' + self.air_interface + ' Pass\u001B[0m')
if self.htmlObj is not None:
self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
- else
+ else:
logging.error('\u001B[1m Building OAI ' + self.air_interface + ' Failed\u001B[0m')
if self.htmlObj is not None:
self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'KO', CONST.ALL_PROCESSES_OK)
diff --git a/ci-scripts/xml_files/enb_ocp_usrp210_build.xml b/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
index 5729846818b..8110c7f1b6c 100644
--- a/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
+++ b/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
@@ -32,7 +32,7 @@
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB OCP (USRP)</desc>
- <Build_eNB_args>-I -w USRP -c --eNBocp --ninja</Build_eNB_args>
+ <Build_eNB_args>-w USRP -c --eNBocp</Build_eNB_args>
</testCase>
</testCaseList>
diff --git a/ci-scripts/xml_files/fr1_multi_node_build.xml b/ci-scripts/xml_files/fr1_multi_node_build.xml
new file mode 100644
index 00000000000..b2c0daa74e4
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_multi_node_build.xml
@@ -0,0 +1,67 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>build-tab</htmlTabRef>
+ <htmlTabName>Build</htmlTabName>
+ <htmlTabIcon>wrench</htmlTabIcon>
+ <TestCaseRequestedList>
+ 010101 010102
+ 000101 000102
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="010101">
+ <class>Build_eNB</class>
+ <desc>Build eNB</desc>
+ <Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+ <eNB_instance>0</eNB_instance>
+ <eNB_serverId>0</eNB_serverId>
+ <backgroundBuild>True</backgroundBuild>
+ </testCase>
+
+ <testCase id="000101">
+ <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">
+ <class>Build_eNB</class>
+ <desc>Build gNB</desc>
+ <Build_eNB_args>-w USRP -c --gNB --ninja</Build_eNB_args>
+ <eNB_instance>1</eNB_instance>
+ <eNB_serverId>1</eNB_serverId>
+ <backgroundBuild>True</backgroundBuild>
+ </testCase>
+
+ <testCase id="000102">
+ <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>
+
+</testCaseList>
--
GitLab