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

feat(ci): changing the XML structure for pulling images

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2022-10-19 09:16:37 +02:00
parent 937be093c1
commit 1a0d91fd76
14 changed files with 17 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/main.py
+3 -4
View File
@@ -468,10 +468,9 @@ def GetParametersFromXML(action):
if (string_field is not None):
CONTAINERS.testSvrId = string_field
CONTAINERS.imageToPull.clear()
for image in test.findall('image_to_pull'):
string_field = image.findtext('image_name')
if (string_field is not None):
CONTAINERS.imageToPull.append(string_field)
string_field = test.findtext('images_to_pull')
if (string_field is not None):
CONTAINERS.imageToPull = string_field.split()
elif action == 'Clean_Test_Server_Images':
string_field = test.findtext('test_svr_id')
ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+1 -6
View File
@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000000">
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+1 -6
View File
@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+1 -6
View File
@@ -43,12 +43,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000001">
ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+1 -6
View File
@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+1 -6
View File
@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+1 -6
View File
@@ -48,12 +48,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_5g_f1_rfsim.xml
+1 -6
View File
@@ -43,12 +43,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
<images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
</testCase>
<testCase id="000020">
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+1 -6
View File
@@ -44,12 +44,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
<images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
</testCase>
<testCase id="000010">
ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+1 -6
View File
@@ -45,12 +45,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
<images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
</testCase>
<testCase id="000000">
ci-scripts/xml_files/container_5g_rfsim.xml
+1 -6
View File
@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
<images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
</testCase>
<testCase id="000000">
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+1 -3
View File
@@ -40,9 +40,7 @@ Replace xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<images_to_pull>oai-enb</images_to_pull>
</testCase>
<testCase id="030101">
ci-scripts/xml_files/container_nsa_b200_quectel.xml
+2 -6
View File
@@ -54,18 +54,14 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<images_to_pull>oai-enb</images_to_pull>
</testCase>
<testCase id="111111">
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>1</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<images_to_pull>oai-gnb</images_to_pull>
</testCase>
<testCase id="010000">
ci-scripts/xml_files/container_sa_b200_quectel.xml
+1 -3
View File
@@ -51,9 +51,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<image_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<images_to_pull>oai-gnb</images_to_pull>
</testCase>
<testCase id="010000">