maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Clean_Test_Server_Images(): harmonize code

Browse Source 
- pass parameter directly instead of indirectly via class
- harmonize to svr_id to read through common code in the next commits
- pass images to express which images will be deleted
- refactor function to use "with" for cls_cmd, and return success (or
  not)
This commit is contained in:
Robert Schmidt
2024-11-25 15:33:41 +01:00
parent 74317e805d
commit 644990a225
49 changed files with 122 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+2 -1
View File
@@ -149,7 +149,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb oai-lte-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+2 -1
View File
@@ -166,7 +166,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+2 -1
View File
@@ -137,7 +137,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+2 -1
View File
@@ -166,7 +166,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+2 -1
View File
@@ -166,7 +166,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+2 -1
View File
@@ -104,7 +104,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+2 -1
View File
@@ -104,7 +104,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+2 -1
View File
@@ -159,7 +159,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb oai-lte-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_e1_rfsim.xml
+2 -1
View File
@@ -107,7 +107,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb oai-nr-cuup oai-nr-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_f1_rfsim.xml
+2 -1
View File
@@ -194,7 +194,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+2 -1
View File
@@ -133,7 +133,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim.xml
+2 -1
View File
@@ -259,7 +259,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+2 -1
View File
@@ -133,7 +133,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+2 -1
View File
@@ -133,7 +133,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+2 -1
View File
@@ -133,7 +133,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+2 -1
View File
@@ -101,7 +101,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+2 -1
View File
@@ -107,7 +107,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+2 -1
View File
@@ -97,7 +97,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+2 -1
View File
@@ -116,7 +116,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+2 -1
View File
@@ -133,7 +133,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+2 -1
View File
@@ -211,7 +211,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+2 -1
View File
@@ -194,7 +194,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+2 -1
View File
@@ -176,7 +176,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+2 -1
View File
@@ -206,7 +206,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+2 -1
View File
@@ -138,7 +138,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+4 -2
View File
@@ -190,14 +190,16 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on eNB Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="333333">
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on LTE-UE Test Server</desc>
<test_svr_id>1</test_svr_id>
<svr_id>1</svr_id>
<images>oai-lte-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+2 -1
View File
@@ -206,7 +206,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+2 -1
View File
@@ -223,7 +223,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+2 -1
View File
@@ -209,7 +209,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+2 -1
View File
@@ -214,7 +214,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+2 -1
View File
@@ -212,7 +212,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+2 -1
View File
@@ -217,7 +217,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+2 -1
View File
@@ -153,7 +153,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+2 -1
View File
@@ -153,7 +153,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
ci-scripts/xml_files/container_nsa_b200_quectel.xml
+4 -2
View File
@@ -252,14 +252,16 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="222221">
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>1</test_svr_id>
<svr_id>1</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_aerial_quectel.xml
+2 -1
View File
@@ -128,7 +128,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-aerial</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_aw2s_asue.xml
+2 -1
View File
@@ -278,7 +278,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-aw2s</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
+2 -1
View File
@@ -275,7 +275,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-aw2s</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_b200_quectel.xml
+2 -1
View File
@@ -220,7 +220,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+2 -1
View File
@@ -218,7 +218,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb oai-nr-cuup</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+2 -1
View File
@@ -251,7 +251,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+2 -1
View File
@@ -154,7 +154,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb-fhi72</images>
</testCase>
<testCase id="888888">
ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
+2 -1
View File
@@ -156,7 +156,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+2 -1
View File
@@ -156,7 +156,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml
+2 -1
View File
@@ -156,7 +156,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_n310_nrue.xml
+4 -2
View File
@@ -163,14 +163,16 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
<testCase id="444444">
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>1</test_svr_id>
<svr_id>1</svr_id>
<images>oai-nr-ue</images>
</testCase>
</testCaseList>
ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+2 -1
View File
@@ -214,7 +214,8 @@
<class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec>
<desc>Clean Test Images on Test Server</desc>
<test_svr_id>0</test_svr_id>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
</testCaseList>