Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-NRF
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-NRF
Commits
6fed78be
Commit
6fed78be
authored
Mar 25, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CI] fix a few cosmetic issues
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
2474fe81
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
ci-scripts/Jenkinsfile-GitLab-Docker
ci-scripts/Jenkinsfile-GitLab-Docker
+7
-2
No files found.
ci-scripts/Jenkinsfile-GitLab-Docker
View file @
6fed78be
...
...
@@ -47,6 +47,9 @@ def nrf_branch = "develop"
// This base image is potentially subject to changes over time.
def
NRF_BASE_IMAGE_TAG
=
params
.
NrfBaseImageTag
// Merge Request Link
def
gitlabMergeRequestLink
//-------------------------------------------------------------------------------
// Pipeline start
pipeline
{
...
...
@@ -215,7 +218,7 @@ pipeline {
steps
{
lock
(
rem_rhel8_resource
)
{
script
{
gitlabCommitStatus
(
name:
"Build RHEL8 NRF Image"
)
{
gitlabCommitStatus
(
name:
"Build RHEL8 NRF Image"
)
{
if
(
"PUSH"
.
equals
(
env
.
gitlabActionType
))
{
// Currently this pipeline only runs for pushes to `develop` branch
// First clean image registry
...
...
@@ -418,6 +421,7 @@ pipeline {
echo
"We failed to prune all unneeded intermediate images"
}
}
// Zipping all archived log files
sh
"zip -r -qq docker_logs.zip archives"
if
(
fileExists
(
'docker_logs.zip'
))
{
...
...
@@ -427,7 +431,6 @@ pipeline {
// Generating the HTML report
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
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=${env.gitlabSourceBranch} --git_src_commit=${env.gitlabMergeRequestLastCommit} --git_pull_request=True --git_target_branch=${env.gitlabTargetBranch} --git_target_commit=${GIT_COMMIT}"
if
(
fileExists
(
'test_results_oai_nrf.html'
))
{
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' test_results_oai_nrf.html"
sh
"sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' test_results_oai_nrf.html"
...
...
@@ -454,6 +457,8 @@ pipeline {
if
(
params
.
sendToCommitterEmail
)
{
emailext
attachmentsPattern:
'*results*.html'
,
body:
'''Hi,
Here are attached HTML report files for $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!
Regards,
...
...
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