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
lizhongxiao
OpenXG-RAN
Commits
a299d6e2
Commit
a299d6e2
authored
Mar 12, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: fix RHEL build status
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
d4495ec7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
13 deletions
+23
-13
ci-scripts/buildOnRH.sh
ci-scripts/buildOnRH.sh
+1
-1
ci-scripts/oai-ci-vm-tool
ci-scripts/oai-ci-vm-tool
+9
-6
ci-scripts/reportBuildLocally.sh
ci-scripts/reportBuildLocally.sh
+8
-2
ci-scripts/reportTestLocally.sh
ci-scripts/reportTestLocally.sh
+1
-1
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+4
-3
No files found.
ci-scripts/buildOnRH.sh
View file @
a299d6e2
...
...
@@ -180,7 +180,7 @@ echo "Checking build status"
echo
"############################################################"
LOG_PATTERN
=
.Rel14.txt
NB_PATTERN_FILES
=
4
NB_PATTERN_FILES
=
7
LOG_FILES
=
`
ls
$ARCHIVES_LOC
/
*
.txt
`
STATUS
=
0
...
...
ci-scripts/oai-ci-vm-tool
View file @
a299d6e2
...
...
@@ -510,13 +510,16 @@ else
fi
fi
# Checking uvt-kvm is installed
UVT_KVM_PATH
=
`
which uvt-kvm |
grep
-c
uvt-kvm
`
if
[
$UVT_KVM_PATH
-eq
0
]
if
[
$REPORT_BUILD_CMD
-ne
1
]
&&
[
$REPORT_TEST_CMD
-ne
1
]
then
echo
"Error: uvt-kvm is not installed"
top_usage
exit
1
# Checking uvt-kvm is installed
UVT_KVM_PATH
=
`
which uvt-kvm |
grep
-c
uvt-kvm
`
if
[
$UVT_KVM_PATH
-eq
0
]
then
echo
"Error: uvt-kvm is not installed"
top_usage
exit
1
fi
fi
if
[
"
$JOB_NAME
"
==
"XX"
]
||
[
"
$BUILD_ID
"
==
"XX"
]
...
...
ci-scripts/reportBuildLocally.sh
View file @
a299d6e2
...
...
@@ -561,7 +561,8 @@ function report_build {
summary_table_row
"LTE SoftModem - Release 14"
./archives/enb_usrp/lte-softmodem.Rel14.txt
"Built target lte-softmodem"
./enb_usrp_row1.html
summary_table_row
"Coding - Release 14"
./archives/enb_usrp/coding.Rel14.txt
"Built target coding"
./enb_usrp_row2.html
summary_table_row
"OAI USRP device if - Release 14"
./archives/enb_usrp/oai_usrpdevif.Rel14.txt
"Built target oai_usrpdevif"
./enb_usrp_row3.html
summary_table_row
"Parameters Lib Config - Release 14"
./archives/enb_usrp/params_libconfig.Rel14.txt
"Built target params_libconfig"
./enb_usrp_row4.html
summary_table_row
"OAI ETHERNET transport - Release 14"
./archives/enb_usrp/oai_eth_transpro.Rel14.txt
"Built target oai_eth_transpro"
./enb_usrp_row4.html
summary_table_row
"Parameters Lib Config - Release 14"
./archives/enb_usrp/params_libconfig.Rel14.txt
"Built target params_libconfig"
./enb_usrp_row5.html
summary_table_footer
summary_table_header
"OAI Build basic simulator option"
./archives/basic_sim
...
...
@@ -604,6 +605,8 @@ function report_build {
summary_table_row
"Parameters Lib Config - Release 14"
./archives/enb_eth/params_libconfig.Rel14.txt
"Built target params_libconfig"
./enb_eth_row4.html
summary_table_row
"RB Tools - Release 14"
./archives/enb_eth/rb_tool.Rel14.txt
"Built target rb_tool"
./enb_eth_row5.html
summary_table_row
"NAS Mesh - Release 14"
./archives/enb_eth/nasmesh.Rel14.txt
"Built target nasmesh"
./enb_eth_row6.html
summary_table_row
"RF Simulator - Release 14"
./archives/enb_eth/rfsimulator.Rel14.txt
"Built target rfsimulator"
./enb_eth_row7.html
summary_table_row
"TCP OAI Bridge - Release 14"
./archives/enb_eth/tcp_bridge_oai.Rel14.txt
"Built target tcp_bridge_oai"
./enb_eth_row8.html
summary_table_footer
summary_table_header
"OAI Build UE -- ETHERNET transport option"
./archives/ue_eth
...
...
@@ -613,6 +616,8 @@ function report_build {
summary_table_row
"Parameters Lib Config - Release 14"
./archives/ue_eth/params_libconfig.Rel14.txt
"Built target params_libconfig"
./ue_eth_row4.html
summary_table_row
"RB Tools - Release 14"
./archives/ue_eth/rb_tool.Rel14.txt
"Built target rb_tool"
./ue_eth_row5.html
summary_table_row
"NAS Mesh - Release 14"
./archives/ue_eth/nasmesh.Rel14.txt
"Built target nasmesh"
./ue_eth_row6.html
summary_table_row
"RF Simulator - Release 14"
./archives/ue_eth/rfsimulator.Rel14.txt
"Built target rfsimulator"
./ue_eth_row7.html
summary_table_row
"TCP OAI Bridge - Release 14"
./archives/ue_eth/tcp_bridge_oai.Rel14.txt
"Built target tcp_bridge_oai"
./ue_eth_row8.html
summary_table_footer
if
[
-e
./archives/red_hat
]
...
...
@@ -623,7 +628,8 @@ function report_build {
summary_table_row
"LTE SoftModem - Release 14"
./archives/red_hat/lte-softmodem.Rel14.txt
"Built target lte-softmodem"
./enb_usrp_rh_row1.html
summary_table_row
"Coding - Release 14"
./archives/red_hat/coding.Rel14.txt
"Built target coding"
./enb_usrp_rh_row2.html
summary_table_row
"OAI USRP device if - Release 14"
./archives/red_hat/oai_usrpdevif.Rel14.txt
"Built target oai_usrpdevif"
./enb_usrp_rh_row3.html
summary_table_row
"Parameters Lib Config - Release 14"
./archives/red_hat/params_libconfig.Rel14.txt
"Built target params_libconfig"
./enb_usrp_rh_row4.html
summary_table_row
"OAI ETHERNET transport - Release 14"
./archives/red_hat/oai_eth_transpro.Rel14.txt
"Built target oai_eth_transpro"
./enb_usrp_rh_row4.html
summary_table_row
"Parameters Lib Config - Release 14"
./archives/red_hat/params_libconfig.Rel14.txt
"Built target params_libconfig"
./enb_usrp_rh_row5.html
summary_table_footer
fi
...
...
ci-scripts/reportTestLocally.sh
View file @
a299d6e2
...
...
@@ -377,7 +377,7 @@ function report_test {
fi
PERF
=
`
echo
"100 *
$FLOAT_EFF_BITRATE
/
$FLOAT_REQ_BITRATE
"
| bc
-l
|
awk
'{printf "%.2f", $0}'
`
PERF_INT
=
`
echo
"100 *
$FLOAT_EFF_BITRATE
/
$FLOAT_REQ_BITRATE
"
| bc
-l
|
awk
'{printf "%.0f", $0}'
`
if
[[
$PERF_INT
-lt
8
0
]]
if
[[
$PERF_INT
-lt
7
0
]]
then
echo
" <td bgcolor =
\"
red
\"
>KO</td>"
>>
./test_simulator_results.html
else
...
...
ci-scripts/runTestOnVM.sh
View file @
a299d6e2
...
...
@@ -228,6 +228,7 @@ function check_iperf {
local
LOC_REQ_BW
=
$2
local
LOC_REQ_BW_MINUS_ONE
=
`
echo
"
$LOC_REQ_BW
- 1"
| bc
-l
`
local
LOC_REQ_BW_MINUS_TWO
=
`
echo
"
$LOC_REQ_BW
- 2"
| bc
-l
`
local
LOC_REQ_BW_MINUS_THREE
=
`
echo
"
$LOC_REQ_BW
- 3"
| bc
-l
`
local
LOC_IS_DL
=
`
echo
$LOC_BASE_LOG
|
grep
-c
_dl
`
local
LOC_IS_BASIC_SIM
=
`
echo
$LOC_BASE_LOG
|
grep
-c
basic_sim
`
if
[
-f
${
LOC_BASE_LOG
}
_client.txt
]
...
...
@@ -240,7 +241,7 @@ function check_iperf {
local
EFFECTIVE_BANDWIDTH
=
`
tail
-n3
${
LOC_BASE_LOG
}
_client.txt | egrep
"Mbits/sec"
|
sed
-e
"s#^.*MBytes *##"
-e
"s#sec.*#sec#"
`
if
[
$LOC_IS_DL
-eq
1
]
&&
[
$LOC_IS_BASIC_SIM
-eq
1
]
then
if
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW
}
.
*
Mbits.
*
]]
||
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW_MINUS_ONE
}
.
*
Mbits.
*
]]
||
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW_MINUS_TWO
}
.
*
Mbits.
*
]]
if
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW
}
.
*
Mbits.
*
]]
||
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW_MINUS_ONE
}
.
*
Mbits.
*
]]
||
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW_MINUS_TWO
}
.
*
Mbits.
*
]]
||
[[
$EFFECTIVE_BANDWIDTH
=
~ .
*${
LOC_REQ_BW_MINUS_THREE
}
.
*
Mbits.
*
]]
then
echo
"got requested DL bandwidth:
$EFFECTIVE_BANDWIDTH
"
else
...
...
@@ -959,10 +960,10 @@ function run_test_on_vm {
echo
"Iperf DL"
echo
"############################################################"
CURR_IPERF_LOG_BASE
=
fdd_20MHz_iperf_dl
iperf_dl
$VM_CMDS
$VM_IP_ADDR
$EPC_VM_CMDS
$EPC_VM_IP_ADDR
1
5
$CURR_IPERF_LOG_BASE
iperf_dl
$VM_CMDS
$VM_IP_ADDR
$EPC_VM_CMDS
$EPC_VM_IP_ADDR
1
2
$CURR_IPERF_LOG_BASE
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$EPC_VM_IP_ADDR
:/home/ubuntu/
${
CURR_IPERF_LOG_BASE
}
_client.txt
$ARCHIVES_LOC
scp
-o
StrictHostKeyChecking
=
no ubuntu@
$VM_IP_ADDR
:/home/ubuntu/tmp/cmake_targets/log/
${
CURR_IPERF_LOG_BASE
}
_server.txt
$ARCHIVES_LOC
check_iperf
$ARCHIVES_LOC
/
$CURR_IPERF_LOG_BASE
1
5
check_iperf
$ARCHIVES_LOC
/
$CURR_IPERF_LOG_BASE
1
2
echo
"############################################################"
echo
"Terminate enb/ue simulators"
...
...
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