Skip to content

O
OpenXG-RAN
Commit 1a0d91fd authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

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

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 937be093
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 76 deletions
ci-scripts/main.py
View file @ 1a0d91fd
...@@ -468,10 +468,9 @@ def GetParametersFromXML(action): ...@@ -468,10 +468,9 @@ def GetParametersFromXML(action):
if (string_field is not None): if (string_field is not None):
CONTAINERS.testSvrId = string_field CONTAINERS.testSvrId = string_field
CONTAINERS.imageToPull.clear() CONTAINERS.imageToPull.clear()
for image in test.findall('image_to_pull'): string_field = test.findtext('images_to_pull')
string_field = image.findtext('image_name') if (string_field is not None):
if (string_field is not None): CONTAINERS.imageToPull = string_field.split()
CONTAINERS.imageToPull.append(string_field)
elif action == 'Clean_Test_Server_Images': elif action == 'Clean_Test_Server_Images':
string_field = test.findtext('test_svr_id') string_field = test.findtext('test_svr_id')
......
ci-scripts/xml_files/container_4g_l2sim_tdd.xml
View file @ 1a0d91fd
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000000"> <testCase id="000000">
......
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
View file @ 1a0d91fd
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000011"> <testCase id="000011">
......
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
View file @ 1a0d91fd
...@@ -43,12 +43,7 @@ ...@@ -43,12 +43,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000001"> <testCase id="000001">
......
ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
View file @ 1a0d91fd
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000011"> <testCase id="000011">
......
ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
View file @ 1a0d91fd
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000011"> <testCase id="000011">
......
ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
View file @ 1a0d91fd
...@@ -48,12 +48,7 @@ ...@@ -48,12 +48,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-lte-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000011"> <testCase id="000011">
......
ci-scripts/xml_files/container_5g_f1_rfsim.xml
View file @ 1a0d91fd
...@@ -43,12 +43,7 @@ ...@@ -43,12 +43,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000020"> <testCase id="000020">
......
ci-scripts/xml_files/container_5g_fdd_rfsim.xml
View file @ 1a0d91fd
...@@ -44,12 +44,7 @@ ...@@ -44,12 +44,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000010"> <testCase id="000010">
......
ci-scripts/xml_files/container_5g_l2sim_tdd.xml
View file @ 1a0d91fd
...@@ -45,12 +45,7 @@ ...@@ -45,12 +45,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000000"> <testCase id="000000">
......
ci-scripts/xml_files/container_5g_rfsim.xml
View file @ 1a0d91fd
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
<image_to_pull>
<image_name>oai-nr-ue</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="000000"> <testCase id="000000">
......
ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
View file @ 1a0d91fd
...@@ -40,9 +40,7 @@ Replace xml_files/enb_usrp210_band7_test_05mhz_tm1.xml ...@@ -40,9 +40,7 @@ Replace xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="030101"> <testCase id="030101">
......
ci-scripts/xml_files/container_nsa_b200_quectel.xml
View file @ 1a0d91fd
...@@ -54,18 +54,14 @@ ...@@ -54,18 +54,14 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-enb</images_to_pull>
<image_name>oai-enb</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="111111"> <testCase id="111111">
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>1</test_svr_id> <test_svr_id>1</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="010000"> <testCase id="010000">
......
ci-scripts/xml_files/container_sa_b200_quectel.xml
View file @ 1a0d91fd
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<image_to_pull> <images_to_pull>oai-gnb</images_to_pull>
<image_name>oai-gnb</image_name>
</image_to_pull>
</testCase> </testCase>
<testCase id="010000"> <testCase id="010000">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment