diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 708c2a6f3c..20ce23ce35 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -662,22 +662,26 @@ class Containerize(): collectInfo['proxy'] = files mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5) result = re.search('Size *= *(?P[0-9\-]+) *bytes', mySSH.getBefore()) + # Cleaning any created tmp volume + mySSH.command(self.cli + ' volume prune --force || true','\$', 15) + mySSH.close() + allImagesSize = {} if result is not None: imageSize = float(result.group('size')) / 1000000 logging.debug('\u001B[1m proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m') allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes' + logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m') + HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize) + return True else: - logging.debug('proxy size is unknown') + logging.error('proxy size is unknown') allImagesSize['proxy'] = 'unknown' - - # Cleaning any created tmp volume - mySSH.command(self.cli + ' volume prune --force || true','\$', 15) - mySSH.close() - - logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m') - HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK) - HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize) + logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m') + HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlTabFooter(False) + return False def BuildRunTests(self, HTML): if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '': diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index e23cffd0dd..e4ddb9e4d7 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -30,6 +30,7 @@ 000021 000022 000023 + 000024 020021 100021 @@ -66,6 +67,12 @@ 14 + + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 + + Ping Ping ext-dn from all NR-UEs diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 769de69e35..09b69730a3 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -29,6 +29,7 @@ 100021 000021 000022 + 000023 020021 030021 030022 @@ -59,6 +60,12 @@ 8 + + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue + + Ping Ping ext-dn from all NR-UEs diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index cfcf40e69e..59be0e3738 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -28,7 +28,6 @@ 111111 100011 - 000010 000011 000012 000013 @@ -47,36 +46,26 @@ oai-gnb-asan oai-nr-ue-asan - - DeployGenObject - Deploy MySql Database - yaml_files/5g_fdd_rfsimulator - mysql - 1 - - DeployGenObject Deploy OAI 5G CoreNetwork yaml_files/5g_fdd_rfsimulator - oai-amf oai-smf oai-upf oai-ext-dn + mysql oai-amf oai-smf oai-upf oai-ext-dn 5 DeployGenObject - Deploy OAI 5G gNB RF sim SA + Deploy OAI 5G gNB+UE RF sim SA yaml_files/5g_fdd_rfsimulator - oai-gnb - 6 + oai-gnb oai-nr-ue + 7 - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_fdd_rfsimulator - oai-nr-ue - 7 + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index 41f25476c3..e90cbc309b 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -28,7 +28,6 @@ 111111 100001 - 000000 000001 000002 000003 @@ -47,36 +46,26 @@ oai-gnb-asan oai-nr-ue-asan - - DeployGenObject - Deploy MySql Database - yaml_files/5g_rfsimulator_24prb - mysql - 1 - - DeployGenObject Deploy OAI 5G CoreNetwork yaml_files/5g_rfsimulator_24prb - oai-amf oai-smf oai-upf oai-ext-dn + mysql oai-amf oai-smf oai-upf oai-ext-dn 5 DeployGenObject - Deploy OAI 5G gNB RF sim SA + Deploy OAI 5G gNB+UE RFsim SA yaml_files/5g_rfsimulator_24prb - oai-gnb - 6 + oai-gnb oai-nr-ue + 7 - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator_24prb - oai-nr-ue - 7 + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index defe15a1df..2b3f3413db 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -28,7 +28,6 @@ 111111 100001 - 000000 000001 000002 000003 @@ -47,36 +46,26 @@ oai-gnb-asan oai-nr-ue-asan - - DeployGenObject - Deploy MySql Database - yaml_files/5g_rfsimulator_2x2 - mysql - 1 - - DeployGenObject Deploy OAI 5G CoreNetwork yaml_files/5g_rfsimulator_2x2 - oai-amf oai-smf oai-upf oai-ext-dn + mysql oai-amf oai-smf oai-upf oai-ext-dn 5 DeployGenObject - Deploy OAI 5G gNB RF sim SA + Deploy OAI 5G gNB+UE RF sim SA yaml_files/5g_rfsimulator_2x2 - oai-gnb - 6 + oai-gnb oai-nr-ue + 7 - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator_2x2 - oai-nr-ue - 7 + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml index d1433db738..fe02da00a0 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml @@ -43,18 +43,16 @@ DeployGenObject - Deploy OAI-DU + Deploy OAI-DU+nrUE yaml_files/5g_rfsimulator_accelleran - oai-du - 1 + oai-du oai-nr-ue + 2 - DeployGenObject - Deploy nrUE - yaml_files/5g_rfsimulator_accelleran - oai-nr-ue - 2 + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml index 7eba071e16..6ed13ceb6e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -50,7 +50,7 @@ Custom_Command Clean-Up any residual volume localhost - docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config + docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml index 9f0c3bc93a..306b8e4e05 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -48,7 +48,7 @@ Custom_Command Clean-Up any residual volume localhost - docker volume rm 5g_rfsimulator_tdd_dora_rrc.config + docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml index f059d69614..f2f4d5e78e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -28,7 +28,6 @@ 111111 100001 - 000000 000001 000002 000003 @@ -47,36 +46,26 @@ oai-gnb-asan oai-nr-ue-asan - - DeployGenObject - Deploy MySql Database - yaml_files/5g_rfsimulator_u0_25prb - mysql - 1 - - DeployGenObject Deploy OAI 5G CoreNetwork yaml_files/5g_rfsimulator_u0_25prb - oai-amf oai-smf oai-upf oai-ext-dn + mysql oai-amf oai-smf oai-upf oai-ext-dn 5 DeployGenObject - Deploy OAI 5G gNB RF sim SA + Deploy OAI 5G gNB+nrUE RF sim SA yaml_files/5g_rfsimulator_u0_25prb - oai-gnb - 6 + oai-gnb oai-nr-ue + 7 - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator_u0_25prb - oai-nr-ue - 7 + Attach_UE + Attach OAI UE (Wait for IP) + rfsim5g_ue diff --git a/ci-scripts/xml_files/container_nsa_b200_terminate.xml b/ci-scripts/xml_files/container_nsa_b200_terminate.xml index a766fb7bcb..c76e3c5891 100644 --- a/ci-scripts/xml_files/container_nsa_b200_terminate.xml +++ b/ci-scripts/xml_files/container_nsa_b200_terminate.xml @@ -26,6 +26,8 @@ tasks 1 + 010001 + 010002 030202 030201 222220 @@ -33,6 +35,17 @@ + + Detach_UE + Detach UE + idefix + + + Terminate_UE + Terminate Quectel + idefix + + Undeploy_Object Undeploy eNB diff --git a/ci-scripts/xml_files/container_sa_b200_terminate.xml b/ci-scripts/xml_files/container_sa_b200_terminate.xml index bddc94aedf..26836fb096 100644 --- a/ci-scripts/xml_files/container_sa_b200_terminate.xml +++ b/ci-scripts/xml_files/container_sa_b200_terminate.xml @@ -26,10 +26,23 @@ tasks 1 + 010001 + 010002 030201 + + Detach_UE + Detach UE + idefix + + + Terminate_UE + Terminate Quectel + idefix + + Undeploy_Object Undeploy gNB diff --git a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml index ad902e838a..ae61c1b6ce 100644 --- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml +++ b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml @@ -26,11 +26,24 @@ tasks 1 + 010001 + 010002 330201 222222 + + Detach_UE + Detach UE + idefix + + + Terminate_UE + Terminate Quectel + idefix + + Undeploy_Object Undeploy CU-CP/CU-UP/DU diff --git a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml index f5b13beaed..df02f63b7f 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml @@ -26,10 +26,23 @@ tasks 1 + 010001 + 010002 230201 + + Detach_UE + Detach UE + idefix + + + Terminate_UE + Terminate Quectel + idefix + + Undeploy_Object Undeploy CU-DU diff --git a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml index 9a041fed7a..f47c16258f 100644 --- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml +++ b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml @@ -26,10 +26,23 @@ tasks 1 + 010001 + 010002 030201 + + Detach_UE + Detach UE + idefix + + + Terminate_UE + Terminate Quectel + idefix + + Undeploy_Object Undeploy gNB