Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AUSF
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
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-AUSF
Commits
6898d6bc
Commit
6898d6bc
authored
Aug 11, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ci): forgot to archives FED results
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
acff4b14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
ci-scripts/Jenkinsfile-GitLab-Docker
ci-scripts/Jenkinsfile-GitLab-Docker
+8
-0
ci-scripts/generateHtmlReport.py
ci-scripts/generateHtmlReport.py
+3
-4
No files found.
ci-scripts/Jenkinsfile-GitLab-Docker
View file @
6898d6bc
...
...
@@ -440,6 +440,10 @@ pipeline {
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' test_results_oai_ausf.html"
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' test_results_oai_ausf.html"
}
if
(
fileExists
(
'test_results_oai_cn5g.html'
))
{
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' *_results_oai_cn5g.html"
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' *_results_oai_cn5g.html"
}
}
else
{
sh
"python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
}
...
...
@@ -448,6 +452,10 @@ pipeline {
sh
"sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' test_results_oai_ausf.html"
archiveArtifacts
artifacts:
'test_results_oai_ausf.html'
}
if
(
fileExists
(
'test_results_oai_cn5g.html'
))
{
sh
"sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' *_results_oai_cn5g.html"
archiveArtifacts
artifacts:
'*_results_oai_cn5g.html'
}
// Sending email to commiter
if
(
params
.
sendToCommitterEmail
!=
null
)
{
...
...
ci-scripts/generateHtmlReport.py
View file @
6898d6bc
...
...
@@ -60,9 +60,6 @@ class HtmlReport():
self
.
imageSizeRow
()
self
.
buildSummaryFooter
()
self
.
testSummaryHeader
()
self
.
testSummaryFooter
()
self
.
generateFooter
()
self
.
file
.
close
()
...
...
@@ -161,7 +158,9 @@ class HtmlReport():
self
.
file
.
write
(
buildSummary
)
cwd
=
os
.
getcwd
()
for
reportFile
in
glob
.
glob
(
'./*results_oai_cn5g.html'
):
for
reportFile
in
glob
.
glob
(
'./*results_oai_*.html'
):
if
reportFile
==
'./test_results_oai_ausf.html'
:
continue
newEpcReport
=
open
(
cwd
+
'/'
+
str
(
reportFile
)
+
'.new'
,
'w'
)
buildSummaryDone
=
True
with
open
(
cwd
+
'/'
+
str
(
reportFile
),
'r'
)
as
originalEpcReport
:
...
...
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