From dee9ce26dba93333d57ce1fe41e964a97006accd Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 15 Nov 2024 15:23:51 +0100 Subject: [PATCH] CI: Pull_Image_from_Registry(): harmonize code - 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. --- ci-scripts/cls_containerize.py | 70 +++++++++---------- ci-scripts/main.py | 11 +-- .../xml_files/container_4g_l2sim_tdd.xml | 4 +- .../container_4g_rfsim_fdd_05MHz.xml | 4 +- .../container_4g_rfsim_fdd_05MHz_noS1.xml | 4 +- .../container_4g_rfsim_fdd_10MHz.xml | 4 +- .../container_4g_rfsim_fdd_20MHz.xml | 4 +- .../xml_files/container_4g_rfsim_fembms.xml | 4 +- .../xml_files/container_4g_rfsim_mbms.xml | 4 +- .../container_4g_rfsim_tdd_05MHz.xml | 4 +- .../xml_files/container_5g_e1_rfsim.xml | 4 +- .../xml_files/container_5g_f1_rfsim.xml | 4 +- .../xml_files/container_5g_fdd_rfsim.xml | 4 +- ci-scripts/xml_files/container_5g_rfsim.xml | 4 +- .../xml_files/container_5g_rfsim_24prb.xml | 4 +- .../xml_files/container_5g_rfsim_2x2.xml | 4 +- .../container_5g_rfsim_fdd_phytest.xml | 4 +- .../container_5g_rfsim_fr2_32prb.xml | 4 +- .../xml_files/container_5g_rfsim_ntn_geo.xml | 4 +- .../xml_files/container_5g_rfsim_sidelink.xml | 4 +- .../xml_files/container_5g_rfsim_tdd_dora.xml | 4 +- .../xml_files/container_5g_rfsim_u0_25prb.xml | 4 +- .../container_lte_b200_fdd_05Mhz_tm1.xml | 4 +- ...container_lte_b200_fdd_05Mhz_tm1_if4_5.xml | 4 +- ...lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml | 4 +- .../container_lte_b200_fdd_10Mhz_tm1.xml | 4 +- .../container_lte_b200_fdd_10Mhz_tm1_cdrx.xml | 4 +- ...container_lte_b200_fdd_10Mhz_tm1_oaiue.xml | 8 +-- .../container_lte_b200_fdd_20Mhz_tm1.xml | 4 +- .../container_lte_b200_tdd_05Mhz_tm1.xml | 4 +- ...container_lte_b200_tdd_05Mhz_tm1_if4_5.xml | 4 +- .../container_lte_b200_tdd_05Mhz_tm2.xml | 4 +- .../container_lte_b200_tdd_10Mhz_tm1.xml | 4 +- .../container_lte_b200_tdd_20Mhz_tm1.xml | 4 +- ...e_b200_tdd_20Mhz_tm1_default_scheduler.xml | 4 +- .../container_lte_n3xx_tdd_2x2_tm1.xml | 4 +- .../container_lte_n3xx_tdd_2x2_tm2.xml | 4 +- .../xml_files/container_nsa_b200_quectel.xml | 8 +-- .../xml_files/container_sa_aerial_quectel.xml | 4 +- .../xml_files/container_sa_b200_quectel.xml | 4 +- .../container_sa_e1_b200_quectel.xml | 4 +- .../container_sa_f1_b200_quectel.xml | 4 +- .../container_sa_sc_b200_quectel.xml | 4 +- 43 files changed, 123 insertions(+), 130 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 34be8fdb1d..26c56c3d61 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -335,7 +335,6 @@ class Containerize(): self.imageToCopy = '' self.testSvrId = '' - self.imageToPull = [] #checkers from xml self.ran_checkers={} @@ -772,45 +771,44 @@ class Containerize(): HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True - def Pull_Image_from_Local_Registry(self, HTML): - lIpAddr, lSourcePath = self.GetCredentials(self.testSvrId) - logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m') - myCmd = cls_cmd.getConnection(lIpAddr) - imagePrefix = 'porcepix.sboai.cs.eurecom.fr' - response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}') - if response.returncode != 0: - msg = 'Could not log into local registry' - logging.error(msg) - myCmd.close() - HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) - return False - pulled_images = [] - for image in self.imageToPull: - tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge) - imageTag = f"{image}:{tagToUse}" - cmd = f'docker pull {imagePrefix}/{imageTag}' - response = myCmd.run(cmd, timeout=120) + def Pull_Image(cmd, images, tag, registry, username, password): + if username is not None and password is not None: + logging.info(f"logging into registry {username}@{registry}") + response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False) if response.returncode != 0: - logging.debug(response) - msg = f'Could not pull {image} from local registry : {imageTag}' + msg = f'Could not log into registry {username}@{registry}' logging.error(msg) - myCmd.close() - HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK) - return False - myCmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}') - myCmd.run(f'docker rmi {imagePrefix}/{imageTag}') + return False, msg + pulled_images = [] + for image in images: + imageTag = f"{image}:{tag}" + response = cmd.run(f'docker pull {registry}/{imageTag}') + if response.returncode != 0: + msg = f'Could not pull {image} from local registry: {imageTag}' + logging.error(msg) + return False, msg + cmd.run(f'docker tag {registry}/{imageTag} oai-ci/{imageTag}') + cmd.run(f'docker rmi {registry}/{imageTag}') pulled_images += [f"oai-ci/{imageTag}"] - response = myCmd.run(f'docker logout {imagePrefix}') - if response.returncode != 0: - msg = 'Could not log off from local registry' - logging.error(msg) - myCmd.close() - HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) - return False - myCmd.close() + if username is not None and password is not None: + response = cmd.run(f'docker logout {registry}') + # we have the images, if logout fails it's no problem msg = "Pulled Images:\n" + '\n'.join(pulled_images) - HTML.CreateHtmlTestRowQueue('N/A', 'OK', [msg]) - return True + return True, msg + + def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"): + lIpAddr, lSourcePath = self.GetCredentials(svr_id) + logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m') + if not tag: + tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge) + with cls_cmd.getConnection(lIpAddr) as cmd: + success, msg = Containerize.Pull_Image(cmd, images, tag, registry, username, password) + param = f"on node {lIpAddr}" + if success: + HTML.CreateHtmlTestRowQueue(param, 'OK', [msg]) + else: + HTML.CreateHtmlTestRowQueue(param, 'KO', [msg]) + return success def Clean_Test_Server_Images(self, HTML): lIpAddr, lSourcePath = self.GetCredentials(self.testSvrId) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 7b6ee6fb25..cb845592b7 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -374,14 +374,9 @@ def ExecuteActionWithParam(action): success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id) elif action == 'Pull_Local_Registry': - string_field = test.findtext('test_svr_id') - if (string_field is not None): - CONTAINERS.testSvrId = string_field - CONTAINERS.imageToPull.clear() - string_field = test.findtext('images_to_pull') - if (string_field is not None): - CONTAINERS.imageToPull = string_field.split() - success = CONTAINERS.Pull_Image_from_Local_Registry(HTML) + svr_id = test.findtext('svr_id') + images = test.findtext('images').split() + success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images) elif action == 'Clean_Test_Server_Images': string_field = test.findtext('test_svr_id') diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index 97a0610efa..b1a60f71f6 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -44,8 +44,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb oai-lte-ue + 0 + oai-enb oai-lte-ue Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index 9e8bb1e704..671ea43b02 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -52,8 +52,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index 0081f8eab9..1bf28038e2 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -43,8 +43,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index 310f886497..54c7d88179 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -47,8 +47,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index 357db604a6..6e362e9af8 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -47,8 +47,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index e1484004e2..7b09f255eb 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -40,8 +40,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index cf154b4476..e11dd8dd2e 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -40,8 +40,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb-asan oai-lte-ue-asan + 0 + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml index 77d9f19ee9..0b2b048944 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -47,8 +47,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb oai-lte-ue + 0 + oai-enb oai-lte-ue Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index bf4cf6ec04..37761a6f50 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -40,8 +40,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb oai-nr-cuup oai-nr-ue + 0 + oai-gnb oai-nr-cuup oai-nr-ue Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 8c925cbc5f..c1876b0d84 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -47,8 +47,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index d3640da596..286c18dfa8 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 16eacb02c5..f6d9fe6de1 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -57,8 +57,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue + 0 + oai-gnb-asan oai-nr-ue Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index 2e3bbf1d3a..8a8372abe0 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index a18928cc80..cc8083d0a2 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml index 10081b9606..8e3b3ef97e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml index b29be08d21..94ece9b2a7 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -39,8 +39,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml index 04bf430f03..2f5085a651 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml @@ -41,8 +41,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml index d42f8851bb..76049a9782 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml @@ -39,8 +39,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-nr-ue-asan + 0 + oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml index 35834493cc..0379099692 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -41,8 +41,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml index 38d88b7e5e..60e00982b1 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-asan oai-nr-ue-asan + 0 + oai-gnb-asan oai-nr-ue-asan Create_Workspace 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 00516269a6..19b8bb26cb 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 @@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb 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 4ede8e072b..f7d3d26482 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 @@ -42,8 +42,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb 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 b9bc7f7a42..c30ff2df52 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 @@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 958e0a895a..0de23d17a5 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 @@ -44,8 +44,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 60a9bd0c16..3975991486 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 @@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml index 10cd2e89c1..6e3cfde69c 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml @@ -49,14 +49,14 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Pull_Local_Registry Pull Images from Local Registry - 1 - oai-lte-ue + 1 + oai-lte-ue Custom_Command 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 510d0d3f2e..dfcbc71373 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 @@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 c8bcde980f..061297649d 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 @@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb 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 22a86d1f57..7d278677b8 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 @@ -41,8 +41,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml index 068d4521b2..1a3bfa6692 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml @@ -41,8 +41,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 570fffef71..abd0ccfe88 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 @@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 49826d782c..f1dfb09103 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 @@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Custom_Command 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 8e47a61a48..55298d2e5d 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 @@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml index d144448301..20cd8db24a 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml @@ -48,8 +48,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml index 50494d7778..0314d118e0 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml @@ -48,8 +48,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml index c745cb90aa..baaa523e48 100644 --- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml @@ -57,15 +57,15 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-enb + 0 + oai-enb Pull_Local_Registry Pull Images from Local Registry - 1 - oai-gnb + 1 + oai-gnb diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml index 63f22af51d..f786f5b17b 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml @@ -43,8 +43,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb-aerial + 0 + oai-gnb-aerial diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml index 4a4c8309a5..214f284e2d 100644 --- a/ci-scripts/xml_files/container_sa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml @@ -59,8 +59,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb + 0 + oai-gnb diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml index 563167a2dd..05a9f92ae8 100644 --- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml @@ -56,8 +56,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb oai-nr-cuup + 0 + oai-gnb oai-nr-cuup diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml index e03180e236..de88240c39 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml @@ -64,8 +64,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb + 0 + oai-gnb diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml index d2bfaa02d4..28f767fda7 100644 --- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml @@ -53,8 +53,8 @@ Pull_Local_Registry Pull Images from Local Registry - 0 - oai-gnb + 0 + oai-gnb