From 1de4a57e7bd05c2caed49a15c88b3395fb1c7ff3 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 15 Jan 2019 16:26:31 +0100
Subject: [PATCH] CI: modified also RRU config
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/conf_files/rru.fdd.band7.conf | 2 +-
ci-scripts/main.py | 2 +-
.../xml_files/enb_usrp210_band7_test_20mhz_tm1.xml | 12 ++++++------
.../xml_files/if4p5_usrp210_band7_test_10mhz.xml | 6 +++---
.../xml_files/if4p5_usrp210_band7_test_20mhz.xml | 8 ++++----
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ci-scripts/conf_files/rru.fdd.band7.conf b/ci-scripts/conf_files/rru.fdd.band7.conf
index ff5e13908e1..dab69e1f1ed 100644
--- a/ci-scripts/conf_files/rru.fdd.band7.conf
+++ b/ci-scripts/conf_files/rru.fdd.band7.conf
@@ -20,7 +20,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
- parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
+ parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 97652736c02..7774a92de5b 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -206,7 +206,7 @@ class SSHConnection():
count = 0
copy_status = False
logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
- while count < 4:
+ while count < 10:
scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 5)
scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
if scp_response == 0:
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml
index 68b38296827..b6c441b19ae 100644
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml
@@ -26,9 +26,9 @@
<htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList>
040101
- 030121 040301 040521 040623 040624 040625 040626 040627 040662 040661 040663 040664 040401 040201 030201
+ 030121 040301 040521 040623 040624 040625 040662 040401 040201 030201
</TestCaseRequestedList>
- <TestCaseExclusionList></TestCaseExclusionList>
+ <TestCaseExclusionList>040626 040627 040661 040663 040664</TestCaseExclusionList>
<testCase id="030121">
<class>Initialize_eNB</class>
@@ -110,16 +110,16 @@
<testCase id="040661">
<class>Iperf</class>
- <desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
- <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+ <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
+ <iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040662">
<class>Iperf</class>
- <desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+ <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
+ <iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
index 340d33196a5..88fb30b840c 100644
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
@@ -94,9 +94,9 @@
<testCase id="040652">
<class>Iperf</class>
- <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
- <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+ <desc>iperf (10MHz - UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
+ <iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
+ <iperf_packetloss_threshold>60</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
index 5d8646cd5e9..798fc1bc8f6 100644
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
@@ -86,16 +86,16 @@
<testCase id="040624">
<class>Iperf</class>
- <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+ <desc>iperf (20MHz - DL/50Mbps/UDP)(30 sec)(single-ue profile)</desc>
+ <iperf_args>-u -b 50M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040662">
<class>Iperf</class>
- <desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+ <desc>iperf (20MHz - UL/10Mbps/UDP)(30 sec)(single-ue profile)</desc>
+ <iperf_args>-u -b 10M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
--
GitLab