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
canghaiwuhen
OpenXG-RAN
Commits
497c6110
Commit
497c6110
authored
Jun 22, 2020
by
Remi Hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 1 after review
parent
a9dbcf6b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
ci-scripts/cls_physim.py
ci-scripts/cls_physim.py
+5
-3
ci-scripts/main.py
ci-scripts/main.py
+1
-1
ci-scripts/xml_files/ldpc_gpu_test.xml
ci-scripts/xml_files/ldpc_gpu_test.xml
+1
-1
No files found.
ci-scripts/cls_physim.py
View file @
497c6110
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
# pexpect
# pexpect
#---------------------------------------------------------------------
#---------------------------------------------------------------------
#to use logging.info()
import
logging
#to create a SSH object locally in the methods
#to create a SSH object locally in the methods
import
sshconnection
import
sshconnection
#to update the HTML object
#to update the HTML object
...
@@ -50,7 +52,7 @@ class PhySim:
...
@@ -50,7 +52,7 @@ class PhySim:
self
.
exitStatus
=
0
self
.
exitStatus
=
0
#private attributes
#private attributes
self
.
__workSpacePath
=
''
self
.
__workSpacePath
=
''
self
.
__buildLogFile
=
'compile_
oai_enb
.log'
self
.
__buildLogFile
=
'compile_
phy_sim
.log'
self
.
__runLogFile
=
'ldpctest_run_results.log'
self
.
__runLogFile
=
'ldpctest_run_results.log'
self
.
__runResults
=
[]
self
.
__runResults
=
[]
...
@@ -101,7 +103,7 @@ class PhySim:
...
@@ -101,7 +103,7 @@ class PhySim:
HTML
.
CreateHtmlTestRow
(
self
.
buildargs
,
'OK'
,
CONST
.
ALL_PROCESSES_OK
,
'LDPC'
)
HTML
.
CreateHtmlTestRow
(
self
.
buildargs
,
'OK'
,
CONST
.
ALL_PROCESSES_OK
,
'LDPC'
)
self
.
exitStatus
=
0
self
.
exitStatus
=
0
else
:
else
:
logging
.
error
(
'
\u001B
[1m Building
OAI UE
Failed
\u001B
[0m'
)
logging
.
error
(
'
\u001B
[1m Building
Physical Simulators
Failed
\u001B
[0m'
)
HTML
.
CreateHtmlTestRow
(
self
.
buildargs
,
'KO'
,
CONST
.
ALL_PROCESSES_OK
,
'LDPC'
)
HTML
.
CreateHtmlTestRow
(
self
.
buildargs
,
'KO'
,
CONST
.
ALL_PROCESSES_OK
,
'LDPC'
)
HTML
.
CreateHtmlTabFooter
(
False
)
HTML
.
CreateHtmlTabFooter
(
False
)
#exitStatus=1 will do a sys.exit in main
#exitStatus=1 will do a sys.exit in main
...
@@ -143,7 +145,7 @@ class PhySim:
...
@@ -143,7 +145,7 @@ class PhySim:
if
(
self
.
ranBranch
!=
'develop'
)
and
(
self
.
ranBranch
!=
'origin/develop'
):
if
(
self
.
ranBranch
!=
'develop'
)
and
(
self
.
ranBranch
!=
'origin/develop'
):
mySSH
.
command
(
'git merge --ff origin/develop -m "Temporary merge for CI"'
,
'\$'
,
5
)
mySSH
.
command
(
'git merge --ff origin/develop -m "Temporary merge for CI"'
,
'\$'
,
5
)
else
:
else
:
print
(
'Merging with the target branch: '
+
self
.
ranTargetBranch
)
logging
.
info
(
'Merging with the target branch: '
+
self
.
ranTargetBranch
)
mySSH
.
command
(
'git merge --ff origin/'
+
self
.
ranTargetBranch
+
' -m "Temporary merge for CI"'
,
'\$'
,
5
)
mySSH
.
command
(
'git merge --ff origin/'
+
self
.
ranTargetBranch
+
' -m "Temporary merge for CI"'
,
'\$'
,
5
)
#build
#build
...
...
ci-scripts/main.py
View file @
497c6110
...
@@ -3517,7 +3517,7 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
...
@@ -3517,7 +3517,7 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
foundCount
+=
1
foundCount
+=
1
count
+=
1
count
+=
1
if
foundCount
!=
HTML
.
GetnbTestXMLfiles
():
if
foundCount
!=
HTML
.
GetnbTestXMLfiles
():
HTML
.
SetnbTestXMLfiles
(
found
c
ount
)
HTML
.
SetnbTestXMLfiles
(
found
C
ount
)
if
(
CiTestObj
.
ADBIPAddress
!=
'none'
):
if
(
CiTestObj
.
ADBIPAddress
!=
'none'
):
terminate_ue_flag
=
False
terminate_ue_flag
=
False
...
...
ci-scripts/xml_files/
rh_
ldpc_gpu_test.xml
→
ci-scripts/xml_files/ldpc_gpu_test.xml
View file @
497c6110
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<testCase
id=
"000001"
>
<testCase
id=
"000001"
>
<class>
Build_PhySim
</class>
<class>
Build_PhySim
</class>
<desc>
Build for physical simulator
</desc>
<desc>
Build for physical simulator
</desc>
<physim_build_args>
--phy_simulators
</physim_build_args>
<physim_build_args>
--phy_simulators
--ninja
</physim_build_args>
</testCase>
</testCase>
<testCase
id=
"000002"
>
<testCase
id=
"000002"
>
...
...
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