From 5d5ade16972f3703d15a79a208528d9bd16aba2f Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 23 Sep 2024 16:52:16 +0200 Subject: [PATCH] Remove superfluous cleanup/terminate/teardown XMLs After the previous commit, the CI will always do an undeployment step even if the CI failed. Hence, these XMLs are not necessary anymore. Some XMLs are updated to do what their "cleanup XML" counterparts did, such as removing additional images. --- .../xml_files/container_4g_l2sim_tdd_down.xml | 47 ----------- .../container_4g_rfsim_fdd_05MHz_down.xml | 47 ----------- ...container_4g_rfsim_fdd_05MHz_noS1_down.xml | 47 ----------- .../container_4g_rfsim_fdd_10MHz_down.xml | 47 ----------- .../container_4g_rfsim_fdd_20MHz_down.xml | 47 ----------- .../container_4g_rfsim_fembms_down.xml | 47 ----------- .../container_4g_rfsim_mbms_down.xml | 47 ----------- .../container_4g_rfsim_tdd_05MHz_down.xml | 47 ----------- .../xml_files/container_5g_e1_rfsim_down.xml | 47 ----------- .../xml_files/container_5g_f1_rfsim_down.xml | 47 ----------- .../xml_files/container_5g_fdd_rfsim_down.xml | 47 ----------- .../xml_files/container_5g_l2sim_tdd_down.xml | 47 ----------- .../container_5g_rfsim_24prb_down.xml | 47 ----------- .../xml_files/container_5g_rfsim_2x2_down.xml | 47 ----------- .../xml_files/container_5g_rfsim_down.xml | 47 ----------- .../container_5g_rfsim_f1_accelleran_down.xml | 47 ----------- .../container_5g_rfsim_fdd_phytest_down.xml | 55 ------------- .../container_5g_rfsim_fr2_32prb_down.xml | 47 ----------- .../container_5g_rfsim_ntn_geo_down.xml | 47 ----------- .../container_5g_rfsim_sidelink_down.xml | 47 ----------- .../container_5g_rfsim_tdd_dora_down.xml | 55 ------------- .../container_5g_rfsim_u0_25prb_down.xml | 47 ----------- .../container_lte_b200_fdd_05Mhz_tm1.xml | 8 ++ ...container_lte_b200_fdd_05Mhz_tm1_if4_5.xml | 8 ++ ...lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml | 8 ++ .../container_lte_b200_fdd_10Mhz_tm1.xml | 8 ++ .../container_lte_b200_fdd_10Mhz_tm1_cdrx.xml | 8 ++ ...r_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml | 63 --------------- .../container_lte_b200_fdd_20Mhz_tm1.xml | 8 ++ .../container_lte_b200_fdd_cleanup.xml | 38 --------- .../container_lte_b200_tdd_05Mhz_tm1.xml | 8 ++ ...container_lte_b200_tdd_05Mhz_tm1_if4_5.xml | 8 ++ .../container_lte_b200_tdd_10Mhz_tm1.xml | 8 ++ .../container_lte_b200_tdd_20Mhz_tm1.xml | 8 ++ ...e_b200_tdd_20Mhz_tm1_default_scheduler.xml | 8 ++ .../container_lte_b200_tdd_cleanup.xml | 38 --------- .../container_lte_n3xx_tdd_2x2_cleanup.xml | 54 ------------- .../container_nsa_b200_terminate.xml | 77 ------------------- .../container_sa_aerial_quectel_cleanup.xml | 54 ------------- .../container_sa_aw2s_asue_cleanup.xml | 55 ------------- .../xml_files/container_sa_b200_terminate.xml | 53 ------------- .../container_sa_e1_b200_terminate.xml | 60 --------------- .../container_sa_f1_b200_terminate.xml | 53 ------------- .../container_sa_fhi72_vvdn_up2_cleanup.xml | 63 --------------- .../container_sa_n310_2X2_100MHz_cleanup.xml | 55 ------------- .../container_sa_n310_2X2_60MHz_cleanup.xml | 55 ------------- .../container_sa_n310_nrue_cleanup.xml | 64 --------------- .../container_sa_sc_b200_terminate.xml | 53 ------------- 48 files changed, 88 insertions(+), 1885 deletions(-) delete mode 100644 ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml delete mode 100644 ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_e1_rfsim_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_f1_rfsim_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml delete mode 100644 ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml delete mode 100644 ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_nsa_b200_terminate.xml delete mode 100644 ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_b200_terminate.xml delete mode 100644 ci-scripts/xml_files/container_sa_e1_b200_terminate.xml delete mode 100644 ci-scripts/xml_files/container_sa_f1_b200_terminate.xml delete mode 100644 ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml delete mode 100644 ci-scripts/xml_files/container_sa_sc_b200_terminate.xml diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml deleted file mode 100644 index 8ac78f544d..0000000000 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - l2sim-4glte-down - CleanUp 4G L2 sim - FDD eNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_l2sim_fdd - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml deleted file mode 100644 index f7ac0a00d6..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-fdd05mhz-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml deleted file mode 100644 index d1b6d6ab93..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-fdd05mhz-nos1-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml deleted file mode 100644 index 2cb868e17a..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-fdd10mhz-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml deleted file mode 100644 index 0582267082..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-fdd20mhz-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml deleted file mode 100644 index d78e9794e0..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-fembms-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_fembms - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml deleted file mode 100644 index 3ad172be93..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-mbms-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_mbms - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml deleted file mode 100644 index 0a6d6bb890..0000000000 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-4glte-tdd05mhz-down - CleanUp 4G RF - trash - - 100011 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 4G stack - ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml deleted file mode 100644 index 3f10e0e32c..0000000000 --- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-down-e1 - CleanUp E1+F1 split - trash - - 100022 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_e1 - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml deleted file mode 100644 index 18b917697c..0000000000 --- a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-down-f1 - CleanUp CU-DU F1 split - trash - - 100022 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_f1_rfsimulator - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml deleted file mode 100644 index 85421f7b6d..0000000000 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-fdd-down - CleanUp Monolithic FDD gNB with SDAP - trash - - 100012 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_fdd_rfsimulator - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml deleted file mode 100644 index 36ce7c71f6..0000000000 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - l2sim-5gnr-down - CleanUp 5G L2 sim - TDD gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_l2sim_tdd - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml deleted file mode 100644 index 09084b0503..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-24prb-5gnr-down - CleanUp Monolithic SA TDD gNB 24PRB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_24prb - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml deleted file mode 100644 index 5d92987c5b..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-2x2-down - CleanUp SA Monolithic TDD 2x2 gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_2x2 - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_down.xml b/ci-scripts/xml_files/container_5g_rfsim_down.xml deleted file mode 100644 index 0c9348e8d6..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-down - CleanUp SA Monolithic TDD gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml deleted file mode 100644 index c8960ccae8..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-down-f1-accelleran - CleanUp - trash - - 100022 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_accelleran - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml deleted file mode 100644 index 14c3f0f32a..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - rfsim-5gnr-fdd-phytest-down - CleanUp Monolithic FDD phytest gNB - trash - - 100012 - 004000 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest - 0 - 0 - - - - Custom_Command - Clean-Up any residual volume - cacofonix - docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml deleted file mode 100644 index 9537b0d5bb..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-fr2-32prb-5gnr-down - CleanUp Monolithic FR2 do-ra gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml deleted file mode 100644 index 48b4a67fb2..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-ntn-geo-down - CleanUp SA Monolithic NTN GEO gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_ntn_geo - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml b/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml deleted file mode 100644 index 6608ebc572..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-sidelink-down - CleanUp sidelink test - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_sidelink - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml deleted file mode 100644 index 35ebe2314a..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - rfsim-tdd-dora-5gnr-down - CleanUp Monolithic do-ra TDD gNB - trash - - 100002 - 004000 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_tdd_dora - 0 - 0 - - - - Custom_Command - Clean-Up any residual volume - cacofonix - docker volume rm 5g_rfsimulator_tdd_dora_rrc.config - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml deleted file mode 100644 index 78b9aacc95..0000000000 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - rfsim-5gnr-u0-25prb-down - CleanUp SA Monolithic FDD u0 25PRB gNB - trash - - 100002 - 222222 - - - - - Undeploy_Object - Undeploy all OAI 5G stack - ci-scripts/yaml_files/5g_rfsimulator_u0_25prb - 0 - 0 - - - - Clean_Test_Server_Images - 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 54261b3505..607c1ebcdd 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 @@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201 200000 +222222 @@ -206,5 +207,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml ltebox-nano + + 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_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml index 3c47ffce7b..53eec11f20 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 @@ -35,6 +35,7 @@ 040301 040531 040633 040634 040636 040671 040672 040673 040401 040201 030231 200000 +222222 @@ -189,4 +190,11 @@ ltebox-nano + + 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_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml index 2674c4198d..669f46f2ec 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 @@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030202 200000 +222222 @@ -171,5 +172,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm adb_ue_1 adb_ue_2 + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 ea95961cba..2aa378b223 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 @@ -37,6 +37,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201 030211 200000 +222222 @@ -201,5 +202,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 9f927db4d4..55653d6e4a 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 @@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 040201 030212 200000 +222222 @@ -133,5 +134,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml deleted file mode 100644 index 03d502fe14..0000000000 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - images-clean-up - Images Clean-Up - trash - -000000 -111111 -222222 -333333 - - - - - Undeploy_Object - Undeploy eNB - ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma - 0 - 0 - - - - Undeploy_Object - Undeploy LTE-UE - ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma - 1 - 1 - - - - Clean_Test_Server_Images - Clean Test Images on eNB Test Server - 0 - - - - Clean_Test_Server_Images - 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 07960f3a37..61fa2dea11 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 @@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 040301 040521 040623 040624 040625 040662 040401 040201 030221 200000 +222222 @@ -201,5 +202,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml deleted file mode 100644 index bc9d2cb361..0000000000 --- a/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - test-fdd-cleanup - CleanUp 4G LTE FDD - trash - - 222222 - - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - 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 52a8df3146..76bd380f4f 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 @@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201 030204 200000 +222222 @@ -218,4 +219,11 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 62c5e5e476..ec280240e0 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 @@ -34,6 +34,7 @@ 040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201 030231 200000 +222222 @@ -204,4 +205,11 @@ ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 574e75d780..7218dcc576 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 @@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201 030214 200000 +222222 @@ -209,4 +210,11 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 516bc48444..4ed3e89e59 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 @@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml 040301 040521 040622 040621 040623 040662 040401 040201 030224 200000 +222222 @@ -207,4 +208,11 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + 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 8156eb517d..9ae77ccec3 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 @@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201 030225 200000 +222222 @@ -212,4 +213,11 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml ltebox-nano + + Clean_Test_Server_Images + true + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml deleted file mode 100644 index 671ef0e5f4..0000000000 --- a/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - test-tdd-cleanup - CleanUp 4G LTE TDD - trash - - 222222 - - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml deleted file mode 100644 index 01c89ae585..0000000000 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - images-clean-up - Images Clean-Up - trash - -111111 -222222 -333333 - - - - - Detach_UE - Detach UE - up2 - - - - Undeploy_Object - Undeploy eNB - ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2 - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images - 0 - - - diff --git a/ci-scripts/xml_files/container_nsa_b200_terminate.xml b/ci-scripts/xml_files/container_nsa_b200_terminate.xml deleted file mode 100644 index b470cfb8b4..0000000000 --- a/ci-scripts/xml_files/container_nsa_b200_terminate.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - TEST-NSA-FR1-TM1-B200-terminate - NSA tear-down in case of problem - tasks - - 010001 - 010002 - 030202 - 030201 - 222220 - 222221 - - - - - Detach_UE - Detach UE - idefix - - - Terminate_UE - Terminate Quectel - idefix - - - - Undeploy_Object - Undeploy eNB - ci-scripts/yaml_files/nsa_b200_enb - 0 - 0 - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/nsa_b200_gnb - 1 - 1 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 1 - - - - diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml b/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml deleted file mode 100644 index 4a8a88fd8a..0000000000 --- a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - test-aerial-cleanup - CleanUp AERIAL - trash - - 000000 - 111111 - 222222 - - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/sa_gnb_aerial - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - - Detach_UE - Terminate UE - up2-aerial - - - diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml b/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml deleted file mode 100644 index 0b90afeee3..0000000000 --- a/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - test-aw2s-cleanup - CleanUp AW2S ASUE - trash - - 111111 - 222222 - 333333 - - - - - Terminate_UE - Terminate UE - amarisoft_ue - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/sa_aw2s_gnb - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - - diff --git a/ci-scripts/xml_files/container_sa_b200_terminate.xml b/ci-scripts/xml_files/container_sa_b200_terminate.xml deleted file mode 100644 index 2d7872e8d8..0000000000 --- a/ci-scripts/xml_files/container_sa_b200_terminate.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - TEST-SA-FR1-B200-terminate - Tear-down - tasks - - 010001 - 010002 - 030201 - - - - - Detach_UE - Detach UE - idefix - - - Terminate_UE - Terminate Quectel - idefix - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/sa_b200_gnb - 0 - 0 - - - diff --git a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml deleted file mode 100644 index 811b047a4a..0000000000 --- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - TEST-SA-FR1-F1-E1-B200-terminate - Tear-down - tasks - - 010001 - 010002 - 330201 - 222222 - - - - - Detach_UE - Detach UE - idefix - - - Terminate_UE - Terminate Quectel - idefix - - - - Undeploy_Object - Undeploy CU-CP/CU-UP/DU - ci-scripts/yaml_files/sa_e1_b200_gnb - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml deleted file mode 100644 index 92e5472c85..0000000000 --- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - TEST-SA-FR1-F1-B200-terminate - Tear-down - tasks - - 010001 - 010002 - 230201 - - - - - Detach_UE - Detach UE - idefix - - - Terminate_UE - Terminate Quectel - idefix - - - - Undeploy_Object - Undeploy CU-DU - ci-scripts/yaml_files/sa_f1_b200_gnb - 0 - 0 - - - diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml deleted file mode 100644 index 1a9aecfc8a..0000000000 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - cleanup-fhi72-vvdn - Cleanup VVDN - trash - - 555555 - 666666 - 777777 - 888888 - - - - - Detach_UE - Detach UE - up2-fhi72 - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb - 0 - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - - Custom_Command - 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_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml deleted file mode 100644 index eb62cdbdd3..0000000000 --- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - test-cleanup - CleanUp SA 2x2 - trash - - 011111 - 022222 - 033333 - - - - - Detach_UE - Detach UE - up2 - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz - 0 - 0 - oai-gnb - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml deleted file mode 100644 index 3efd2f7be8..0000000000 --- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - test-cleanup - CleanUp SA 2x2 - trash - - 111111 - 222222 - 333333 - - - - - Detach_UE - Detach UE - up2 - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz - 0 - 0 - oai-gnb - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - diff --git a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml deleted file mode 100644 index 035e38a40d..0000000000 --- a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - test-aw2s-cleanup - CleanUp of test servers - trash - - 111111 - 222222 - 333333 - 444444 - - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/5g_sa_n310_gnb - 0 - 0 - - - - Undeploy_Object - Undeploy nr UE - ci-scripts/yaml_files/5g_sa_n310_nrue - 1 - 1 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 0 - - - - Clean_Test_Server_Images - Clean Test Images on Test Server - 1 - - - - diff --git a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml deleted file mode 100644 index 9db4c663f0..0000000000 --- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - TEST-SA-FR1-B200-terminate - Tear-down - tasks - - 010001 - 010002 - 030201 - - - - - Detach_UE - Detach UE - idefix - - - Terminate_UE - Terminate Quectel - idefix - - - - Undeploy_Object - Undeploy gNB - ci-scripts/yaml_files/sa_sc_b200_gnb - 0 - 0 - - -