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

CI: Pull_Image_from_Registry(): harmonize code

Browse Source 
- pass parameter directly instead of indirectly via class
- call it simply "images", to harmonize with clean-function later
- harmonize to svr_id as in the previous commit
- rewrite function to use with-statement with cls_cmd
- optionally pass a tag to use (which will be used in a test, and can be
  used to pull flexric)
- Introduce Pull_Image() which does the actual pulling, can pull from
  any registry, and will be reused in the case of pulling from cluster.
This commit is contained in:
Robert Schmidt
2024-11-25 15:33:41 +01:00
parent a48728ba35
commit dee9ce26db
43 changed files with 123 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+2 -2
View File
@@ -44,8 +44,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb oai-lte-ue</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+2 -2
View File
@@ -52,8 +52,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+2 -2
View File
@@ -43,8 +43,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+2 -2
View File
@@ -47,8 +47,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+2 -2
View File
@@ -47,8 +47,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+2 -2
View File
@@ -40,8 +40,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+2 -2
View File
@@ -40,8 +40,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb-asan oai-lte-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+2 -2
View File
@@ -47,8 +47,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb oai-lte-ue</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_e1_rfsim.xml
+2 -2
View File
@@ -40,8 +40,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb oai-nr-cuup oai-nr-ue</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_f1_rfsim.xml
+2 -2
View File
@@ -47,8 +47,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_rfsim.xml
+2 -2
View File
@@ -57,8 +57,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="004000">
ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+2 -2
View File
@@ -39,8 +39,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+2 -2
View File
@@ -41,8 +41,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+2 -2
View File
@@ -39,8 +39,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+2 -2
View File
@@ -41,8 +41,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="004000">
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-asan oai-nr-ue-asan</images>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+2 -2
View File
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+2 -2
View File
@@ -42,8 +42,8 @@
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+2 -2
View File
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+2 -2
View File
@@ -44,8 +44,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+2 -2
View File
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+4 -4
View File
@@ -49,14 +49,14 @@
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>1</test_svr_id>
<images_to_pull>oai-lte-ue</images_to_pull>
<svr_id>1</svr_id>
<images>oai-lte-ue</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+2 -2
View File
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+2 -2
View File
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+2 -2
View File
@@ -41,8 +41,8 @@
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+2 -2
View File
@@ -41,8 +41,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+2 -2
View File
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+2 -2
View File
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
<class>Custom_Command</class>
ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+2 -2
View File
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+2 -2
View File
@@ -48,8 +48,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+2 -2
View File
@@ -48,8 +48,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_nsa_b200_quectel.xml
+4 -4
View File
@@ -57,15 +57,15 @@
<testCase id="111110">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-enb</images>
</testCase>
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>1</test_svr_id>
<images_to_pull>oai-gnb</images_to_pull>
<svr_id>1</svr_id>
<images>oai-gnb</images>
</testCase>
<testCase id = "100000">
ci-scripts/xml_files/container_sa_aerial_quectel.xml
+2 -2
View File
@@ -43,8 +43,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-aerial</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb-aerial</images>
</testCase>
<testCase id="800813">
ci-scripts/xml_files/container_sa_b200_quectel.xml
+2 -2
View File
@@ -59,8 +59,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
<testCase id="100000">
ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+2 -2
View File
@@ -56,8 +56,8 @@
<testCase id="333333">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb oai-nr-cuup</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb oai-nr-cuup</images>
</testCase>
<testCase id="310000">
ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+2 -2
View File
@@ -64,8 +64,8 @@
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
<testCase id="110000">
ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+2 -2
View File
@@ -53,8 +53,8 @@
<testCase id="311111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb</images_to_pull>
<svr_id>0</svr_id>
<images>oai-gnb</images>
</testCase>
<testCase id="300000">