diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index 8ec97c2e6e..78c20fb172 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -293,7 +293,7 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages) return True - def AttachUE(self, HTML, RAN, EPC, CONTAINERS): + def AttachUE(self, HTML): ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor: futures = [executor.submit(ue.attach) for ue in ues] @@ -307,7 +307,6 @@ class OaiCiTest(): else: logging.error(f'error attaching or wrong MTU: attached {attached}, mtus {mtus}') HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"]) - self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS) return success def DetachUE(self, HTML): @@ -358,7 +357,7 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue('NA', 'OK', messages) return True - def Ping_common(self, EPC, ue, RAN, logPath): + def Ping_common(self, EPC, ue, logPath): # Launch ping on the EPC side (true for ltebox and old open-air-cn) ping_status = 0 ueIP = ue.getIP() @@ -429,7 +428,7 @@ class OaiCiTest(): return (True, message) - def Ping(self,HTML,RAN,EPC,CONTAINERS): + def Ping(self, HTML, EPC, CONTAINERS): if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter') @@ -444,7 +443,7 @@ class OaiCiTest(): ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] logging.debug(ues) with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor: - futures = [executor.submit(self.Ping_common, EPC, ue, RAN, logPath) for ue in ues] + futures = [executor.submit(self.Ping_common, EPC, ue, logPath) for ue in ues] results = [f.result() for f in futures] # each result in results is a tuple, first member goes to successes, second to messages successes, messages = map(list, zip(*results)) @@ -463,10 +462,9 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', messages) else: HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages) - self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS) return success - def Iperf_Module(self, EPC, ue, svr, RAN, idx, ue_num, logPath): + def Iperf_Module(self, EPC, ue, svr, idx, ue_num, logPath): ueIP = ue.getIP() if not ueIP: return (False, f"UE {ue.getName()} has no IP address") @@ -512,7 +510,7 @@ class OaiCiTest(): return (status, f'{ue_header}\n{msg}') - def Iperf(self,HTML,RAN,EPC,CONTAINERS): + def Iperf(self,HTML,EPC,CONTAINERS): if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter') @@ -530,7 +528,7 @@ class OaiCiTest(): svr = cls_module.Module_UE(self.svr_id,self.svr_node) logging.debug(ues) with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor: - futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, RAN, i, len(ues), logPath) for i, ue in enumerate(ues)] + futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, i, len(ues), logPath) for i, ue in enumerate(ues)] results = [f.result() for f in futures] # each result in results is a tuple, first member goes to successes, second to messages successes, messages = map(list, zip(*results)) @@ -549,10 +547,9 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages) else: HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages) - self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS) return success - def Iperf2_Unidir(self,HTML,RAN,EPC,CONTAINERS): + def Iperf2_Unidir(self,HTML,EPC,CONTAINERS): if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1: raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported") ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip()) @@ -590,7 +587,6 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', [f'{ue_header}\n{msg}']) else: HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', [f'{ue_header}\n{msg}']) - self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS) return success def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN): @@ -874,62 +870,6 @@ class OaiCiTest(): HTML.CreateHtmlTestRowQueue(f'N/A', 'OK', messages) return True - def AutoTerminateUEandeNB(self,HTML,RAN,EPC,CONTAINERS): - if (RAN.Initialize_eNB_args != ''): - self.testCase_id = 'AUTO-KILL-RAN' - HTML.testCase_id = self.testCase_id - self.desc = 'Automatic Termination of all RAN nodes' - HTML.desc = self.desc - self.ShowTestID() - #terminate all RAN nodes eNB/gNB/OCP - for instance in range(0, len(RAN.air_interface)): - if RAN.air_interface[instance]!='': - logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}') - RAN.eNB_instance=instance - RAN.TerminateeNB(HTML,EPC) - if CONTAINERS.yamlPath[0] != '': - self.testCase_id = 'AUTO-KILL-CONTAINERS' - HTML.testCase_id = self.testCase_id - self.desc = 'Automatic Termination of all RAN containers' - HTML.desc = self.desc - self.ShowTestID() - for instance in range(0, len(CONTAINERS.yamlPath)): - if CONTAINERS.yamlPath[instance]!='': - CONTAINERS.eNB_instance=instance - if CONTAINERS.deployKind[instance]: - CONTAINERS.UndeployObject(HTML,RAN) - else: - CONTAINERS.UndeployGenObject(HTML,RAN, self) - - #this function is called only if eNB/gNB fails to start - #RH to be re-factored - def AutoTerminateeNB(self,HTML,RAN,EPC,CONTAINERS): - if (RAN.Initialize_eNB_args != ''): - self.testCase_id = 'AUTO-KILL-RAN' - HTML.testCase_id = self.testCase_id - self.desc = 'Automatic Termination of all RAN nodes' - HTML.desc = self.desc - self.ShowTestID() - #terminate all RAN nodes eNB/gNB/OCP - for instance in range(0, len(RAN.air_interface)): - if RAN.air_interface[instance]!='': - logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}') - RAN.eNB_instance=instance - RAN.TerminateeNB(HTML,EPC) - if CONTAINERS.yamlPath[0] != '': - self.testCase_id = 'AUTO-KILL-CONTAINERS' - HTML.testCase_id = self.testCase_id - self.desc = 'Automatic Termination of all RAN containers' - HTML.desc = self.desc - self.ShowTestID() - for instance in range(0, len(CONTAINERS.yamlPath)): - if CONTAINERS.yamlPath[instance]!='': - CONTAINERS.eNB_instance=instance - if CONTAINERS.deployKind[instance]: - CONTAINERS.UndeployObject(HTML,RAN) - else: - CONTAINERS.UndeployGenObject(HTML,RAN,self) - def LogCollectBuild(self,RAN): # Some pipelines are using "none" IP / Credentials # In that case, just forget about it diff --git a/ci-scripts/main.py b/ci-scripts/main.py index b6f59950ec..9c6a20d935 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -235,7 +235,7 @@ def ExecuteActionWithParam(action): if action == 'Initialize_UE': success = CiTestObj.InitializeUE(HTML) elif action == 'Attach_UE': - success = CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS) + success = CiTestObj.AttachUE(HTML) elif action == 'Detach_UE': success = CiTestObj.DetachUE(HTML) elif action == 'Terminate_UE': @@ -259,7 +259,7 @@ def ExecuteActionWithParam(action): else: CiTestObj.nodes = [None] * len(CiTestObj.ue_ids) ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or '' - success = CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS) + success = CiTestObj.Ping(HTML,EPC,CONTAINERS) elif action == 'Iperf' or action == 'Iperf2_Unidir': CiTestObj.iperf_args = test.findtext('iperf_args') @@ -286,9 +286,9 @@ def ExecuteActionWithParam(action): logging.error('test-case has wrong option ' + CiTestObj.iperf_options) CiTestObj.iperf_options = 'check' if action == 'Iperf': - success = CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS) + success = CiTestObj.Iperf(HTML, EPC, CONTAINERS) elif action == 'Iperf2_Unidir': - success = CiTestObj.Iperf2_Unidir(HTML,RAN,EPC,CONTAINERS) + success = CiTestObj.Iperf2_Unidir(HTML, EPC, CONTAINERS) elif action == 'IdleSleep': st = test.findtext('idle_sleep_time_in_sec') or "5" @@ -376,12 +376,8 @@ def ExecuteActionWithParam(action): CONTAINERS.services[CONTAINERS.eNB_instance] = string_field if action == 'Deploy_Object': success = CONTAINERS.DeployObject(HTML) - if not success: - CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS) elif action == 'Undeploy_Object': success = CONTAINERS.UndeployObject(HTML, RAN) - if not success: - CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS) elif action == 'Create_Workspace': success = CONTAINERS.Create_Workspace(HTML) @@ -746,7 +742,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re if not test_succeeded: logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests") task_set_succeeded = False - CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS) except Exception as e: s = traceback.format_exc() logging.error(f'while running CI, an exception occurred:\n{s}') diff --git a/ci-scripts/tests/ping-iperf.py b/ci-scripts/tests/ping-iperf.py index 7fb019e5fb..6ba35d04d3 100644 --- a/ci-scripts/tests/ping-iperf.py +++ b/ci-scripts/tests/ping-iperf.py @@ -14,7 +14,6 @@ sys.path.append('./') # to find OAI imports below import cls_oai_html import cls_oaicitest import cls_containerize -import ran import epc class TestPingIperf(unittest.TestCase): @@ -30,13 +29,12 @@ class TestPingIperf(unittest.TestCase): self.epc.UserName = None self.epc.Password = None self.epc.SourceCodePath = os.getcwd() - self.ran = ran.RANManagement() def test_ping(self): self.ci.ping_args = "-c3 127.0.0.1" self.ci.ping_packetloss_threshold = "0" # TODO Should need nothing but options and UE(s) to use - success = self.ci.Ping(self.html, self.ran, self.epc, self.cont) + success = self.ci.Ping(self.html, self.epc, self.cont) self.assertTrue(success) def test_iperf(self): @@ -50,7 +48,7 @@ class TestPingIperf(unittest.TestCase): self.ci.iperf_bitrate_threshold = "0" self.ci.iperf_profile = "balanced" # TODO Should need nothing but options and UE(s) to use - success = self.ci.Iperf(self.html, self.ran, self.epc, self.cont) + success = self.ci.Iperf(self.html, self.epc, self.cont) self.assertTrue(success) if __name__ == '__main__': diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index 2bd0c5fcf9..28f55c6d68 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -37,6 +37,7 @@ 030011 030012 100001 + 222222 @@ -139,8 +140,16 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_l2sim_fdd + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index a637d79cba..c717ba87b9 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -40,6 +40,7 @@ 030011 030012 100011 + 222222 @@ -154,10 +155,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index 642342e7b8..67f66d2e6c 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -36,6 +36,7 @@ 030011 030012 100011 + 222222 @@ -125,10 +126,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index cddecd09d0..f04057d8bf 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -40,6 +40,7 @@ 030011 030012 100011 + 222222 @@ -154,10 +155,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index 619257cbc1..449341e13e 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -40,6 +40,7 @@ 030011 030012 100011 + 222222 @@ -154,10 +155,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index d33832d3c2..7ef304e648 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -33,6 +33,7 @@ 000001 030011 100011 + 222222 @@ -92,10 +93,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_fembms 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index 04ec93ebf5..8236192138 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -33,6 +33,7 @@ 000001 030011 100011 + 222222 @@ -92,10 +93,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_mbms 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml index f7b1e50ebb..eb84827141 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -40,6 +40,7 @@ 030011 030012 100011 + 222222 @@ -147,10 +148,18 @@ Undeploy_Object + true Undeploy all OAI 4G stack ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index 87827cbdf7..fa8f47a558 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -33,6 +33,7 @@ 000024 020021 100021 + 222222 @@ -93,6 +94,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_e1 1,0,0,0 @@ -101,4 +103,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 56071f4b1b..a246727da1 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -35,6 +35,7 @@ 030021 030022 100021 + 222222 @@ -150,6 +151,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_f1_rfsimulator 30,30,100,100 @@ -158,4 +160,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index e1aff907a9..a1454ed8bd 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -35,6 +35,7 @@ 030011 030012 100011 + 222222 @@ -119,6 +120,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_fdd_rfsimulator 1,0,0,0 @@ -127,4 +129,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index bef0a13e2d..aa9fd2ece9 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -35,6 +35,7 @@ 020001 020002 100001 + 222222 @@ -113,6 +114,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_l2sim_tdd 20,50,100,100 @@ -121,4 +123,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 0e1b1d3710..edc9f1f30f 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -50,6 +50,7 @@ 333333 020006 100001 + 222222 @@ -245,6 +246,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator 1,0,0,0 @@ -253,4 +255,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index f25928ab32..92f853fa99 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -35,6 +35,7 @@ 030001 030002 100001 + 222222 @@ -119,6 +120,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_24prb 1,0,0,0 @@ -127,4 +129,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index 7826a6e818..67b2273a68 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -35,6 +35,7 @@ 030001 030002 100001 + 222222 @@ -119,6 +120,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_2x2 0 @@ -127,4 +129,11 @@ 1,0,0,0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 31d9a04790..07df4a751e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml @@ -32,6 +32,7 @@ 020021 100021 100022 + 222222 @@ -74,10 +75,18 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_accelleran 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 c7d1824b4c..8d43480c8e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -35,6 +35,7 @@ 030011 030012 100011 + 222222 @@ -119,6 +120,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest 10,100,100,100 @@ -127,4 +129,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml index 311ec9b0bc..ee88b9de87 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -32,6 +32,7 @@ 020001 020002 100001 + 222222 @@ -87,6 +88,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb 10,0,0,0 @@ -95,4 +97,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml index 9966bd0e90..2a8147140d 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml @@ -34,6 +34,7 @@ 020001 020002 100001 + 222222 @@ -95,10 +96,18 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_ntn_geo 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml index 8f1039f5cd..f3be815e30 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml @@ -32,6 +32,7 @@ 000004 000005 100001 + 222222 @@ -83,6 +84,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_sidelink 1,0,0,0 @@ -91,4 +93,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 a169c78528..3b48f7b901 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -33,6 +33,8 @@ 020001 020002 100001 + 004000 + 222222 @@ -93,6 +95,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_tdd_dora 0,0,0,0 @@ -101,4 +104,19 @@ 0 + + Custom_Command + true + Clean-Up any residual volume + cacofonix + docker volume rm 5g_rfsimulator_tdd_dora_rrc.config + + + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 51b59d35f1..cb4a9cd9f7 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -35,6 +35,7 @@ 030001 030002 100001 + 222222 @@ -119,6 +120,7 @@ Undeploy_Object + true Undeploy all OAI 5G stack ci-scripts/yaml_files/5g_rfsimulator_u0_25prb 1,0,0,0 @@ -127,4 +129,11 @@ 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml index 268be0974c..54261b3505 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml @@ -54,6 +54,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -86,6 +87,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1 0 @@ -99,6 +101,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -109,6 +112,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Detach_UE + true Detach UEs adb_ue_1 adb_ue_2 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 index adfe8860d6..3c47ffce7b 100644 --- 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 @@ -53,6 +53,7 @@ Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -94,6 +95,7 @@ Undeploy_Object + true Undeploy RCC/RRU ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5 0 @@ -107,6 +109,7 @@ Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -117,6 +120,7 @@ Detach_UE + true Detach UEs adb_ue_1 adb_ue_2 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 673bf65609..2674c4198d 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 @@ -52,6 +52,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -72,6 +73,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity 0 @@ -85,6 +87,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -95,6 +98,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Detach_UE + true Detach UE adb_ue_1 adb_ue_2 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 472122d2e4..ea95961cba 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 @@ -54,6 +54,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -80,6 +81,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1 0 @@ -93,6 +95,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -103,6 +106,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 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 1534150b01..9f927db4d4 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 @@ -53,6 +53,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -73,6 +74,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx 0 @@ -86,6 +88,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -96,6 +99,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml index 0e58e6b6ed..cefa6cd5c1 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml @@ -41,6 +41,8 @@ 030211 200000 200001 +222222 +333333 @@ -70,12 +72,14 @@ Custom_Command + true Enable Sleep States (hutch) hutch sudo cpupower idle-set -E Custom_Command + true Enable Sleep States (carabe) carabe sudo cpupower idle-set -E @@ -121,6 +125,7 @@ Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma 0 @@ -129,6 +134,7 @@ Undeploy_Object + true Undeploy LTE-UE ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma 1 @@ -180,4 +186,18 @@ nano-cn4g + + Clean_Test_Server_Images + true + Clean Test Images on eNB Test Server + 0 + + + + Clean_Test_Server_Images + true + Clean Test Images on LTE-UE Test Server + 1 + + 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 48aa606fa4..07960f3a37 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 @@ -53,6 +53,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Custom_Command + true Enable Sleep States hutch sudo cpupower idle-set -E @@ -79,6 +80,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1 0 @@ -92,6 +94,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -102,6 +105,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml index a512156ff5..52a8df3146 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml @@ -54,6 +54,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -87,6 +88,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1 0 @@ -100,6 +102,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -110,6 +113,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml index 827675f3fb..62c5e5e476 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml @@ -33,7 +33,6 @@ 030135 040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201 030231 -040101 200000 @@ -53,6 +52,7 @@ Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -95,6 +95,7 @@ Undeploy_Object + true Undeploy RRU/RCC ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5 0 @@ -108,6 +109,7 @@ Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -118,6 +120,7 @@ Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml index 77a13d9407..9111f00365 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml @@ -52,6 +52,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -78,6 +79,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2 0 @@ -91,6 +93,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -101,6 +104,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml index ed37d24eae..574e75d780 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml @@ -52,6 +52,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -78,6 +79,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1 0 @@ -91,6 +93,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -101,6 +104,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml index 1a9983e67e..516bc48444 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml @@ -52,6 +52,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -78,6 +79,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1 0 @@ -91,6 +93,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -101,6 +104,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml index e3f0f49140..8156eb517d 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml @@ -53,6 +53,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Custom_Command + true Enable Sleep States starsky sudo cpupower idle-set -E @@ -79,6 +80,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler 0 @@ -92,6 +94,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Terminate_UE + true Terminate UE adb_ue_1 adb_ue_2 @@ -102,6 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Detach_UE + true Detach UE adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml index 8316645417..cfae0e6188 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml @@ -40,6 +40,7 @@ 070001 010010 030201 +333333 @@ -130,12 +131,14 @@ Detach_UE + true Detach UE up2 Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1 0 @@ -146,5 +149,12 @@ --> + + Clean_Test_Server_Images + true + Clean Test Images + 0 + + diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml index 96baab0793..1df5ea169c 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml @@ -40,6 +40,7 @@ 071001 010010 031201 +333333 @@ -130,12 +131,14 @@ Detach_UE + true Detach UE up2 Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2 0 @@ -146,5 +149,13 @@ --> + + Clean_Test_Server_Images + true + Clean Test Images + 0 + + + diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml index de6098209f..7e831b2454 100644 --- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml @@ -49,6 +49,8 @@ 030201 300000 600000 + 222220 + 222221 @@ -81,6 +83,7 @@ Custom_Command + true Enable Sleep States (nepes) nepes sudo cpupower idle-set -E @@ -93,6 +96,7 @@ Custom_Command + true Enable Sleep States (ofqot) ofqot sudo cpupower idle-set -E @@ -105,6 +109,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -115,6 +120,7 @@ Detach_UE + true Detach UE idefix @@ -224,6 +230,7 @@ Undeploy_Object + true Undeploy eNB ci-scripts/yaml_files/nsa_b200_enb 0 @@ -232,6 +239,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/nsa_b200_gnb 1 @@ -240,5 +248,19 @@ 10,100,100,100 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 1 + + diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml index 50a1a02256..43fdf4b65b 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml @@ -36,6 +36,7 @@ 000033 000222 222222 + 333333 @@ -107,12 +108,14 @@ Detach_UE + true Detach Quectel up2-aerial Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/sa_gnb_aerial 0 @@ -120,5 +123,13 @@ 20,100,100,100 20,100,100,100 + + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index 4900330911..3929687f1b 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -56,6 +56,7 @@ 004000 000002 030000 + 333333 @@ -242,12 +243,14 @@ Detach_UE + true Detach UE amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16 Terminate_UE + true Terminate UE amarisoft_ue @@ -260,10 +263,18 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/sa_aw2s_gnb 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml index acc9e15e5c..4776bd784e 100644 --- a/ci-scripts/xml_files/container_sa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml @@ -70,6 +70,7 @@ Custom_Command + true Enable Sleep States ofqot sudo cpupower idle-set -E @@ -82,6 +83,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -92,6 +94,7 @@ Detach_UE + true Detach UE idefix @@ -203,6 +206,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/sa_b200_gnb 0 diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml index f31ef7e7eb..4e4eab92c1 100644 --- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml @@ -49,6 +49,7 @@ 310002 330201 200000 + 222222 @@ -66,6 +67,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -76,6 +78,7 @@ Detach_UE + true Detach Quectel idefix @@ -118,6 +121,7 @@ Custom_Command + true Enable Sleep States ofqot sudo cpupower idle-set -E @@ -201,7 +205,8 @@ Undeploy_Object - Undeploy CU-DU + true + Undeploy CUCP/CU-UP/DU ci-scripts/yaml_files/sa_e1_b200_gnb 0 0 @@ -209,5 +214,12 @@ 10,100,100,100 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml index 1b3c9baa33..4cce964633 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml @@ -66,6 +66,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -76,6 +77,7 @@ Detach_UE + true Detach Quectel idefix @@ -110,6 +112,7 @@ Custom_Command + true Enable Sleep States ofqot sudo cpupower idle-set -E @@ -226,6 +229,7 @@ Undeploy_Object + true Undeploy CU-DU ci-scripts/yaml_files/sa_f1_b200_gnb 0 diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml index 3d2a7a9387..b81ef51d5b 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml @@ -39,6 +39,8 @@ 103000 100002 130000 + 777777 + 888888 @@ -127,6 +129,7 @@ Detach_UE + true Detach UE up2-fhi72 @@ -139,10 +142,28 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb 0 0 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + + + Custom_Command + true + Set CPU to idle state, set kernel parameters to default values + cacofonix + /opt/FHI7.2/setup_cleanup.sh + yes + + + diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml index 272582a46e..c713e5a431 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml @@ -39,6 +39,7 @@ 000001 040201 200000 + 033333 @@ -58,6 +59,7 @@ Custom_Command + true Enable Sleep States matix sudo cpupower idle-set -E @@ -71,6 +73,7 @@ Detach_UE + true Detach UE up2 @@ -139,6 +142,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz 0 @@ -148,5 +152,12 @@ 10,100,100,100 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml index 4c619255f1..fc0baadaca 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml @@ -39,6 +39,7 @@ 000001 030201 200000 + 333333 @@ -58,6 +59,7 @@ Custom_Command + true Enable Sleep States matix sudo cpupower idle-set -E @@ -71,6 +73,7 @@ Detach_UE + true Detach UE up2 @@ -139,6 +142,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz 0 @@ -148,5 +152,12 @@ 10,100,100,100 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml index a44c703322..f00a452403 100644 --- a/ci-scripts/xml_files/container_sa_n310_nrue.xml +++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml @@ -36,6 +36,8 @@ 000100 000200 040001 040000 + 333333 + 444444 @@ -139,6 +141,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/5g_sa_n310_gnb 0 @@ -149,10 +152,25 @@ Undeploy_Object + true Undeploy nr UE ci-scripts/yaml_files/5g_sa_n310_nrue 1 1 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 1 + + diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml index 425edc12ee..d0dc59f3cc 100644 --- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml @@ -64,6 +64,7 @@ Custom_Command + true Enable Sleep States ofqot sudo cpupower idle-set -E @@ -76,6 +77,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -86,6 +88,7 @@ Detach_UE + true Detach UE idefix @@ -197,6 +200,7 @@ Undeploy_Object + true Undeploy gNB ci-scripts/yaml_files/sa_sc_b200_gnb 0 diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 20f502e9ac..caea61f3b4 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -57,6 +57,7 @@ Custom_Command + true Enable Sleep States (obelix) obelix sudo cpupower idle-set -E @@ -69,6 +70,7 @@ Custom_Command + true Enable Sleep States (asterix) asterix sudo cpupower idle-set -E @@ -81,6 +83,7 @@ Terminate_UE + true Terminate Quectel nrmodule2_quectel @@ -91,6 +94,7 @@ Detach_UE + true Detach Quectel nrmodule2_quectel @@ -183,6 +187,7 @@ Terminate_eNB + true Terminate eNB 0 0 @@ -191,6 +196,7 @@ Terminate_eNB + true Terminate gNB 1 1 diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index b089d1d75c..170bb6443b 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -62,6 +62,7 @@ Terminate_UE + true Terminate Quectel nrmodule2_quectel @@ -84,6 +85,7 @@ Custom_Command + true Enable Sleep States (asterix) asterix sudo cpupower idle-set -E @@ -96,6 +98,7 @@ Custom_Command + true Enable Sleep States (obelix) obelix sudo cpupower idle-set -E @@ -151,6 +154,7 @@ Terminate_eNB + true Terminate eNB 0 0 @@ -159,6 +163,7 @@ Terminate_eNB + true Terminate gNB 1 1 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml index 142e4014dd..755f3ad969 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml @@ -91,6 +91,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -101,6 +102,7 @@ Detach_UE + true Detach Quectel idefix @@ -174,6 +176,7 @@ Terminate_eNB + true Terminate eNB 0 0 @@ -182,6 +185,7 @@ Terminate_eNB + true Terminate gNB 1 1 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml index df8b1c049d..66bcf54be2 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml @@ -57,6 +57,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -139,6 +140,7 @@ Terminate_eNB + true Terminate eNB 0 0 @@ -147,6 +149,7 @@ Terminate_eNB + true Terminate gNB 1 1 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml index 05fbcc4ab6..aebf6bf668 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml @@ -53,6 +53,7 @@ Terminate_UE + true Terminate Quectel idefix @@ -63,6 +64,7 @@ Detach_UE + true Detach Quectel idefix @@ -136,6 +138,7 @@ Terminate_eNB + true Terminate eNB 0 0 @@ -144,6 +147,7 @@ Terminate_eNB + true Terminate gNB 1 1 diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml index 3bf54786b5..88f5079b68 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml @@ -36,6 +36,7 @@ Custom_Command + true Enable Sleep States caracal sudo cpupower idle-set -E @@ -60,6 +61,7 @@ Terminate_eNB + true Terminate gNB NR diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml index daea0f4456..f81d747bfe 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml @@ -36,6 +36,7 @@ Custom_Command + true Enable Sleep States caracal sudo cpupower idle-set -E @@ -60,6 +61,7 @@ Terminate_eNB + true Terminate gNB NR diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml index b436e79b17..4b0fec92e2 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml @@ -36,6 +36,7 @@ Custom_Command + true Enable Sleep States caracal sudo cpupower idle-set -E @@ -60,6 +61,7 @@ Terminate_eNB + true Terminate gNB NR diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml index e6aeb6cdee..f9e298127f 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml @@ -36,6 +36,7 @@ Custom_Command + true Enable Sleep States caracal sudo cpupower idle-set -E @@ -60,6 +61,7 @@ Terminate_eNB + true Terminate gNB NR