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
spbro
OpenXG-RAN
Commits
465c1f47
Commit
465c1f47
authored
Dec 09, 2021
by
hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change git post appearance
parent
3166289e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+1
-1
ci-scripts/ran_dashboard/Hdashboard.py
ci-scripts/ran_dashboard/Hdashboard.py
+8
-7
No files found.
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
View file @
465c1f47
...
@@ -390,7 +390,7 @@ pipeline {
...
@@ -390,7 +390,7 @@ pipeline {
steps
{
steps
{
script
{
script
{
dir
(
'ci-scripts/ran_dashboard'
)
{
dir
(
'ci-scripts/ran_dashboard'
)
{
sh
"python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${StatusForDb} "
sh
"python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${
env.BUILD_ID} ${
StatusForDb} "
}
}
}
}
}
}
...
...
ci-scripts/ran_dashboard/Hdashboard.py
View file @
465c1f47
...
@@ -507,23 +507,23 @@ class Dashboard:
...
@@ -507,23 +507,23 @@ class Dashboard:
s3
.
meta
.
client
.
copy
(
copy_source
,
'oaitestdashboard'
,
path
+
'/'
+
'test_styles.css'
)
s3
.
meta
.
client
.
copy
(
copy_source
,
'oaitestdashboard'
,
path
+
'/'
+
'test_styles.css'
)
def
PostGitNote
(
self
,
mr
,
jobname
,
buildurl
,
status
):
def
PostGitNote
(
self
,
mr
,
jobname
,
buildurl
,
buildid
,
status
):
gl
=
gitlab
.
Gitlab
.
from_config
(
'OAI'
)
gl
=
gitlab
.
Gitlab
.
from_config
(
'OAI'
)
project_id
=
223
project_id
=
223
project
=
gl
.
projects
.
get
(
project_id
)
project
=
gl
.
projects
.
get
(
project_id
)
editable_mr
=
project
.
mergerequests
.
get
(
int
(
mr
))
editable_mr
=
project
.
mergerequests
.
get
(
int
(
mr
))
mr_notes
=
editable_mr
.
notes
.
list
()
mr_notes
=
editable_mr
.
notes
.
list
()
mr_note
=
editable_mr
.
notes
.
create
({
mr_note
=
editable_mr
.
notes
.
create
({
'body'
:
'Completed Test : '
+
jobname
+
'
, status : <b>'
+
status
+
'</b><br>
'
+
\
'body'
:
'Completed Test : '
+
jobname
+
'
, status: <b>'
+
status
+
'</b>,
'
+
\
'
Link to this test : '
+
buildurl
+
'
<br>'
+
\
'
(<a href="'
+
buildurl
+
'">'
+
buildid
+
'</a>)
<br>'
+
\
'<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'
+
mr
+
'/index.html">Consolidated Test Results
(All End-to-End LTE/NSA/SA/2x2/OAIUE)
</a>'
'<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'
+
mr
+
'/index.html">Consolidated Test Results</a>'
})
})
editable_mr
.
save
()
editable_mr
.
save
()
def
main
():
def
main
():
#call from Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${StatusForDb} "
#call from Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${
env.BUILD_ID} ${
StatusForDb} "
#individual MR test results + test dashboard, event based (end of jenkins pipeline)
#individual MR test results + test dashboard, event based (end of jenkins pipeline)
if
len
(
sys
.
argv
)
>
1
:
if
len
(
sys
.
argv
)
>
1
:
...
@@ -531,13 +531,14 @@ def main():
...
@@ -531,13 +531,14 @@ def main():
mr
=
sys
.
argv
[
2
]
mr
=
sys
.
argv
[
2
]
jobname
=
sys
.
argv
[
3
]
jobname
=
sys
.
argv
[
3
]
buildurl
=
sys
.
argv
[
4
]
buildurl
=
sys
.
argv
[
4
]
status
=
sys
.
argv
[
5
]
buildid
=
sys
.
argv
[
5
]
status
=
sys
.
argv
[
6
]
htmlDash
=
Dashboard
()
htmlDash
=
Dashboard
()
htmlDash
.
Build
(
'singleMR'
,
mr
,
'/tmp/MR'
+
mr
+
'_index.html'
)
htmlDash
.
Build
(
'singleMR'
,
mr
,
'/tmp/MR'
+
mr
+
'_index.html'
)
htmlDash
.
CopyToS3
(
'/tmp/MR'
+
mr
+
'_index.html'
,
'oaitestdashboard'
,
'MR'
+
mr
+
'/index.html'
)
htmlDash
.
CopyToS3
(
'/tmp/MR'
+
mr
+
'_index.html'
,
'oaitestdashboard'
,
'MR'
+
mr
+
'/index.html'
)
htmlDash
.
Build
(
'Tests'
,
'0000'
,
'/tmp/Tests_index.html'
)
htmlDash
.
Build
(
'Tests'
,
'0000'
,
'/tmp/Tests_index.html'
)
htmlDash
.
CopyToS3
(
'/tmp/Tests_index.html'
,
'oaitestdashboard'
,
'index.html'
)
htmlDash
.
CopyToS3
(
'/tmp/Tests_index.html'
,
'oaitestdashboard'
,
'index.html'
)
htmlDash
.
PostGitNote
(
mr
,
jobname
,
buildurl
,
status
)
htmlDash
.
PostGitNote
(
mr
,
jobname
,
buildurl
,
buildid
,
status
)
#test and MR status dash boards, cron based
#test and MR status dash boards, cron based
else
:
else
:
htmlDash
=
Dashboard
()
htmlDash
=
Dashboard
()
...
...
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