From 69c4acfb8508a41b331e83c49516694e6dffab77 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 4 Apr 2019 20:55:41 +0200 Subject: [PATCH] CI: fix on detach Signed-off-by: Raphael Defosseux --- ci-scripts/main.py | 5 +++-- .../enb_ue_usrp210_band7_test_05mhz_tm1.xml | 15 +++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index ea50496f50..f5d34156d8 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -305,6 +305,7 @@ class SSHConnection(): sys.exit('SCP failed') def BuildeNB(self): + return if self.eNBIPAddress == '' or self.eNBRepository == '' or self.eNBBranch == '' or self.eNBUserName == '' or self.eNBPassword == '' or self.eNBSourceCodePath == '': Usage() sys.exit('Insufficient Parameter') @@ -993,7 +994,7 @@ class SSHConnection(): Usage() sys.exit('Insufficient Parameter') check_eNB = True - check_OAI_UE = True + check_OAI_UE = False pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE) if (pStatus < 0): self.CreateHtmlTestRow('N/A', 'KO', pStatus) @@ -1058,7 +1059,7 @@ class SSHConnection(): Usage() sys.exit('Insufficient Parameter') check_eNB = True - check_OAI_UE = True + check_OAI_UE = False pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE) if (pStatus < 0): self.CreateHtmlTestRow('N/A', 'KO', pStatus) diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml index d069a1970a..a2bf9ae423 100644 --- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml +++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml @@ -25,7 +25,7 @@ Test-05MHz-TM1 tasks - 030101 000001 090101 000002 040501 040502 000001 040601 000001 040641 000001 090109 030201 + 030101 000001 090101 000002 040501 040502 000001 040601 040641 000001 040602 040642 000001 090109 030201 @@ -90,6 +90,13 @@ 50 + + Iperf + iperf (5MHz - DL/15Mbps/UDP)(30 sec) + -u -b 15M -t 30 -i 1 -c 10.0.1.2 + 50 + + Iperf iperf (5MHz - DL/TCP)(30 sec)(single-ue profile) @@ -116,10 +123,10 @@ Iperf - iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile) - -u -b 9M -t 30 -i 1 -R + iperf (5MHz - UL/9Mbps/UDP)(30 sec) + -u -b 9M -t 30 -i 1 -R -c 10.0.1.1 50 - single-ue + balanced