From 4a2abc03b59c52a7ed70d32261c8bde8c581b5b2 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 23 Jan 2020 11:05:08 +0100 Subject: [PATCH] CI: splitting build xml files into build and epc-start XML files Signed-off-by: Raphael Defosseux --- .../xml_files/enb_ue_usrp210_band7_build.xml | 38 +++++++++++ .../enb_ue_usrp210_band7_ue_build.xml | 38 +++++++++++ .../xml_files/enb_usrp210_band13_build.xml | 16 ----- .../enb_usrp210_band13_epc_start.xml | 48 ++++++++++++++ .../xml_files/enb_usrp210_band40_build.xml | 16 ----- .../enb_usrp210_band40_epc_start.xml | 47 ++++++++++++++ .../xml_files/enb_usrp210_band7_build.xml | 16 ----- .../xml_files/enb_usrp210_band7_epc_start.xml | 47 ++++++++++++++ ...st_05mhz_tm1_rrc_inactivity_no_flexran.xml | 4 +- ...est_05mhz_tm1_rrc_inactivity_w_flexran.xml | 8 +-- .../xml_files/enb_usrpB210_band7_50PRB.xml | 65 ------------------- .../xml_files/if4p5_usrp210_band40_build.xml | 16 ----- .../if4p5_usrp210_band40_epc_start.xml | 48 ++++++++++++++ .../xml_files/if4p5_usrp210_band7_build.xml | 16 ----- .../if4p5_usrp210_band7_epc_start.xml | 48 ++++++++++++++ .../x2ho_enb_usrp210_band13_build.xml | 16 ----- .../x2ho_enb_usrp210_band13_epc_start.xml | 48 ++++++++++++++ 17 files changed, 368 insertions(+), 167 deletions(-) create mode 100644 ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml create mode 100644 ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml create mode 100644 ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml create mode 100644 ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml create mode 100644 ci-scripts/xml_files/enb_usrp210_band7_epc_start.xml delete mode 100644 ci-scripts/xml_files/enb_usrpB210_band7_50PRB.xml create mode 100644 ci-scripts/xml_files/if4p5_usrp210_band40_epc_start.xml create mode 100644 ci-scripts/xml_files/if4p5_usrp210_band7_epc_start.xml create mode 100644 ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml new file mode 100644 index 0000000000..64c3517166 --- /dev/null +++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml @@ -0,0 +1,38 @@ + + + build-tab + Build + wrench + + 010101 + + + + + Build_eNB + Build eNB (USRP) + -w USRP -c --eNB + + + diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml new file mode 100644 index 0000000000..7280a87fb8 --- /dev/null +++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml @@ -0,0 +1,38 @@ + + + oai-ue-build-tab + OAI-UE-Build + wrench + +090101 + + + + + Build_OAI_UE + Build OAI UE + -w USRP --UE + + + diff --git a/ci-scripts/xml_files/enb_usrp210_band13_build.xml b/ci-scripts/xml_files/enb_usrp210_band13_build.xml index 96ab517b34..888a1230ae 100644 --- a/ci-scripts/xml_files/enb_usrp210_band13_build.xml +++ b/ci-scripts/xml_files/enb_usrp210_band13_build.xml @@ -26,7 +26,6 @@ wrench 010101 - 050101 060101 070101 @@ -37,19 +36,4 @@ -w USRP -c --eNB - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml b/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml new file mode 100644 index 0000000000..0a788cb614 --- /dev/null +++ b/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml @@ -0,0 +1,48 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 + + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + + diff --git a/ci-scripts/xml_files/enb_usrp210_band40_build.xml b/ci-scripts/xml_files/enb_usrp210_band40_build.xml index fd32019bb5..64c3517166 100644 --- a/ci-scripts/xml_files/enb_usrp210_band40_build.xml +++ b/ci-scripts/xml_files/enb_usrp210_band40_build.xml @@ -26,7 +26,6 @@ wrench 010101 - 050101 060101 070101 @@ -36,19 +35,4 @@ -w USRP -c --eNB - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml b/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml new file mode 100644 index 0000000000..354cff346e --- /dev/null +++ b/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml @@ -0,0 +1,47 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + + diff --git a/ci-scripts/xml_files/enb_usrp210_band7_build.xml b/ci-scripts/xml_files/enb_usrp210_band7_build.xml index fd32019bb5..64c3517166 100644 --- a/ci-scripts/xml_files/enb_usrp210_band7_build.xml +++ b/ci-scripts/xml_files/enb_usrp210_band7_build.xml @@ -26,7 +26,6 @@ wrench 010101 - 050101 060101 070101 @@ -36,19 +35,4 @@ -w USRP -c --eNB - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/enb_usrp210_band7_epc_start.xml b/ci-scripts/xml_files/enb_usrp210_band7_epc_start.xml new file mode 100644 index 0000000000..354cff346e --- /dev/null +++ b/ci-scripts/xml_files/enb_usrp210_band7_epc_start.xml @@ -0,0 +1,47 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + + diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml index 686e5b1b38..a28a81d970 100644 --- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml +++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml @@ -21,8 +21,8 @@ --> - test-05-tm1 - Test-05MHz-TM1 + test-05-tm1-rrc-no-flex + Test-05MHz-TM1-RRC-Inactivity tasks 030201 diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml index 9e7227aa47..07cd8fbb30 100644 --- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml +++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml @@ -21,8 +21,8 @@ --> - test-05-tm1 - Test-05MHz-TM1 + test-05-tm1-rrc-w-flex + Test-05MHz-TM1-RRC-Inactivity-FlexRan tasks 2 @@ -36,8 +36,8 @@ IdleSleep - Waiting for 35 seconds - 35 + Waiting for 45 seconds + 45 diff --git a/ci-scripts/xml_files/enb_usrpB210_band7_50PRB.xml b/ci-scripts/xml_files/enb_usrpB210_band7_50PRB.xml deleted file mode 100644 index 56dfe2be72..0000000000 --- a/ci-scripts/xml_files/enb_usrpB210_band7_50PRB.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 030101 040101 040301 040501 040401 040201 030201 - - - - Initialize_eNB - Initialize eNB (FDD/Band1/5MHz/info) - -O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf - - - - Terminate_eNB - Terminate eNB - - - - Initialize_UE - Initialize UE - - - - Terminate_UE - Terminate UE - - - - Attach_UE - Attach UE - - - - Detach_UE - Detach UE - - - - Ping - ping (20 sec) - -c 20 - 5 - - - diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml index 752049349f..ab221c918d 100644 --- a/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml +++ b/ci-scripts/xml_files/if4p5_usrp210_band40_build.xml @@ -26,7 +26,6 @@ wrench 010101 - 050101 060101 070101 @@ -37,19 +36,4 @@ -w USRP -c --eNB - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_epc_start.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_epc_start.xml new file mode 100644 index 0000000000..0a788cb614 --- /dev/null +++ b/ci-scripts/xml_files/if4p5_usrp210_band40_epc_start.xml @@ -0,0 +1,48 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 + + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + + diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml index 8cbd2d84c6..ab221c918d 100644 --- a/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml +++ b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml @@ -26,7 +26,6 @@ wrench 010101 - 050101 060101 070101 040101 @@ -37,19 +36,4 @@ -w USRP -c --eNB - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_epc_start.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_start.xml new file mode 100644 index 0000000000..e8d08de507 --- /dev/null +++ b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_start.xml @@ -0,0 +1,48 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 040101 + + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + + diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml index 0d2a122537..c5a912a33d 100644 --- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml +++ b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml @@ -27,7 +27,6 @@ 010101 010102 - 050101 060101 070101 @@ -48,19 +47,4 @@ 1 - - Initialize_HSS - Initialize HSS - - - - Initialize_MME - Initialize MME - - - - Initialize_SPGW - Initialize SPGW - - diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml new file mode 100644 index 0000000000..0a788cb614 --- /dev/null +++ b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml @@ -0,0 +1,48 @@ + + + epc-start-tab + EPC-Start + log-in + + 050101 060101 070101 + + + + + + Initialize_HSS + Initialize HSS + + + + Initialize_MME + Initialize MME + + + + Initialize_SPGW + Initialize SPGW + + +