From 925b4dea215023145971537ffcd8fb569a14cf60 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 14 Jun 2023 12:00:03 +0200 Subject: [PATCH] chore(ci): adding one FDD scenario Signed-off-by: Raphael Defosseux --- ci-scripts/cls_containerize.py | 4 +- ci-scripts/ran.py | 2 +- ...container_lte_b200_fdd_05Mhz_tm1_if4_5.xml | 184 ++++++++++++++++++ ...lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml | 4 +- .../container_lte_b200_fdd_10Mhz_tm1.xml | 4 +- .../container_lte_b200_fdd_10Mhz_tm1_cdrx.xml | 4 +- .../container_lte_b200_fdd_20Mhz_tm1.xml | 4 +- 7 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 520876ad06..54edae9e67 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -842,8 +842,6 @@ class Containerize(): for image in imagesList: imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge) mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2) - localMmeIpAddr = EPC.MmeIPAddress - mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2) # Currently support only one svcName = self.services[self.eNB_instance] @@ -903,7 +901,7 @@ class Containerize(): cnt = 0 while (cnt < 20): mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30) - result = re.search('got sync|Starting F1AP at CU', mySSH.getBefore()) + result = re.search('got sync|Starting F1AP at CU|Waiting for RUs to be configured', mySSH.getBefore()) if result is None: time.sleep(6) cnt += 1 diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index fff204a018..ba618d3b01 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -895,7 +895,7 @@ class RANManagement(): htmleNBFailureMsg += ' Command line option(s) correctly applied ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n' else: htmleNBFailureMsg += ' Command line option(s) NOT applied ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n' - result = re.search('Exiting OAI softmodem', str(line)) + result = re.search('Exiting OAI softmodem|Caught SIGTERM, shutting down', str(line)) if result is not None: exitSignalReceived = True result = re.search('[Ss]egmentation [Ff]ault', str(line)) diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml new file mode 100644 index 0000000000..4abc2855bc --- /dev/null +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml @@ -0,0 +1,184 @@ + + + test-fdd-05-tm1-if4-5 + Test-FDD-05MHz-TM1-IF4.5 + tasks + +100000 +111110 +300000 +040101 +030131 030132 +040301 040531 040633 040634 040636 040671 040672 040673 040401 040201 +030231 +200000 + + + + + Pull_Local_Registry + Pull Images from Local Registry + 0 + oai-enb + + + + Custom_Command + Disable Sleep States + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + Enable Sleep States + hutch + sudo cpupower idle-set -E + + + Custom_Command + Reset USRP + hutch + sudo -S b2xx_fx3_utils --reset-device + + + + Deploy_Object + Deploy RRU (FDD/Band7/5MHz/B200) in a container + ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5 + rru_fdd + 0 + 0 + + + + Deploy_Object + Deploy RCC (FDD/Band7/5MHz) in a container + ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5 + rcc_fdd + 0 + 0 + + + + IdleSleep + Sleep + 5 + + + + Undeploy_Object + Undeploy RCC/RRU + ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5 + 0 + 0 + + + + Initialize_UE + Initialize UE + adb_ue_1 adb_ue_2 + + + Terminate_UE + Terminate UE + adb_ue_1 adb_ue_2 + + + Attach_UE + Attach UEs + adb_ue_1 adb_ue_2 + + + Detach_UE + Detach UEs + adb_ue_1 adb_ue_2 + + + + Ping + ping (5MHz - 20 sec) + -c 20 + 5 + adb_ue_1 adb_ue_2 + + + + Iperf + iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile) + -u -b 15M -t 30 -i 1 + 50 + DL + adb_ue_1 adb_ue_2 + + + + Iperf + iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile) + -u -b 15M -t 30 -i 1 + 50 + DL + adb_ue_1 + + + + Iperf + iperf (5MHz - DL/TCP)(30 sec)(single-ue profile) + -t 30 -i 1 -fm + 50 + single-ue + DL + adb_ue_2 + + + + Iperf + iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile) + -u -b 9M -t 30 -i 1 + 50 + balanced + UL + adb_ue_1 adb_ue_2 + + + + Iperf + iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile) + -u -b 9M -t 30 -i 1 + 50 + single-ue + UL + adb_ue_1 + + + + Iperf + iperf (5MHz - UL/TCP)(30 sec)(single-ue profile) + -t 30 -i 1 -fm + 50 + single-ue + UL + adb_ue_1 + + + diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml index bf8cb5e256..149ecf9b70 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml @@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm 040101 030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 -030201 +030202 200000 @@ -64,7 +64,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm 0 - + Undeploy_Object Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml index ea89f4193a..5b9f060d3c 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml @@ -34,7 +34,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 030111 000001 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201 -030201 +030211 200000 @@ -72,7 +72,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 5 - + Undeploy_Object Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1 diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml index 788a1759dc..cafcc91a69 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml @@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 030112 040301 040302 040512 040612 040650 040401 040201 -030201 +030212 200000 @@ -65,7 +65,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 0 - + Undeploy_Object Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml index 4fef927a3b..49f221644b 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml @@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 030121 000001 040301 040521 040623 040624 040625 040662 040401 040201 -030201 +030221 200000 @@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 5 - + Undeploy_Object Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1