Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZhouShuya
OpenXG-RAN
Commits
8b46aea3
Commit
8b46aea3
authored
Aug 24, 2018
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: optimization on scripts
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
0c83df3f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
7 deletions
+17
-7
ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
+1
-1
ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
+1
-1
ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+1
-1
ci-scripts/main.py
ci-scripts/main.py
+14
-4
No files found.
ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
View file @
8b46aea3
...
...
@@ -33,7 +33,7 @@ eNBs =
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
7
;
downlink_frequency
=
268
5
000000
L
;
downlink_frequency
=
268
0
000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
100
;
...
...
ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
View file @
8b46aea3
...
...
@@ -33,7 +33,7 @@ eNBs =
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
7
;
downlink_frequency
=
268
5
000000
L
;
downlink_frequency
=
268
0
000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
...
...
ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
View file @
8b46aea3
...
...
@@ -33,7 +33,7 @@ eNBs =
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
7
;
downlink_frequency
=
268
5
000000
L
;
downlink_frequency
=
268
0
000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
50
;
...
...
ci-scripts/main.py
View file @
8b46aea3
...
...
@@ -308,17 +308,25 @@ class SSHConnection():
loopCounter
=
loopCounter
-
1
if
(
loopCounter
==
0
):
doLoop
=
False
# Checking if process is still alive
self
.
command
(
'stdbuf -o0 ps -aux | grep -v grep | grep --color=never lte-softmodem'
,
'\$'
,
5
)
result
=
re
.
search
(
'lte-softmodem'
,
str
(
self
.
ssh
.
before
))
if
result
is
None
:
logging
.
debug
(
'
\u001B
[1;37;41m eNB process is already down
\u001B
[0m'
)
self
.
CreateHtmlTestRow
(
'-O '
+
config_file
+
extra_options
,
'KO'
,
0
)
self
.
CreateHtmlFooter
()
sys
.
exit
(
1
)
logging
.
debug
(
'
\u001B
[1;30;43m eNB logging system did not show got sync! See with attach later
\u001B
[0m'
)
self
.
CreateHtmlTestRow
(
config_file
,
'eNB not showing got sync!'
,
0
)
self
.
CreateHtmlTestRow
(
'-O '
+
config_file
+
extra_options
,
'eNB not showing got sync!'
,
0
)
# Not getting got sync is bypassed for the moment
#sys.exit(1)
self
.
command
(
'stdbuf -o0 cat enb_'
+
SSH
.
testCase_id
+
'.log | grep -i sync'
,
'\$'
,
10
)
self
.
command
(
'stdbuf -o0 cat enb_'
+
SSH
.
testCase_id
+
'.log | grep -
-color=never -
i sync'
,
'\$'
,
10
)
result
=
re
.
search
(
'got sync'
,
str
(
self
.
ssh
.
before
))
if
result
is
None
:
time
.
sleep
(
6
)
else
:
doLoop
=
False
self
.
CreateHtmlTestRow
(
config_file
,
'OK'
,
0
)
self
.
CreateHtmlTestRow
(
'-O '
+
config_file
+
extra_options
,
'OK'
,
0
)
logging
.
debug
(
'
\u001B
[1m Initialize eNB Completed
\u001B
[0m'
)
self
.
close
()
...
...
@@ -650,6 +658,7 @@ class SSHConnection():
if
(
status_queue
.
empty
()):
self
.
CreateHtmlTestRow
(
self
.
ping_args
,
'KO'
,
len
(
self
.
UEDevices
))
self
.
CreateHtmlFooter
()
sys
.
exit
(
1
)
else
:
ping_status
=
True
...
...
@@ -695,7 +704,7 @@ class SSHConnection():
else
:
iperf_bandwidth_new
=
residualBW
iperf_bandwidth_str
=
'-b '
+
iperf_bandwidth
iperf_bandwidth_str_new
=
'-b '
+
str
(
iperf_bandwidth_new
)
iperf_bandwidth_str_new
=
'-b '
+
(
'%.2f'
%
iperf_bandwidth_new
)
result
=
re
.
sub
(
iperf_bandwidth_str
,
iperf_bandwidth_str_new
,
str
(
self
.
iperf_args
))
if
result
is
None
:
logging
.
debug
(
'
\u001B
[1;37;41m Calculate Iperf bandwidth Failed!
\u001B
[0m'
)
...
...
@@ -1074,6 +1083,7 @@ class SSHConnection():
if
(
status_queue
.
empty
()):
self
.
CreateHtmlTestRow
(
self
.
iperf_args
,
'KO'
,
len
(
self
.
UEDevices
))
self
.
CreateHtmlFooter
()
sys
.
exit
(
1
)
else
:
iperf_status
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment