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
b2077c77
Commit
b2077c77
authored
Jul 12, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: fix Merge Request URL recovery
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
1f78950f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ci-scripts/Jenkinsfile-GitLab-Docker
ci-scripts/Jenkinsfile-GitLab-Docker
+2
-1
ci-scripts/generateHtmlReport.py
ci-scripts/generateHtmlReport.py
+1
-1
No files found.
ci-scripts/Jenkinsfile-GitLab-Docker
View file @
b2077c77
...
@@ -121,7 +121,8 @@ pipeline {
...
@@ -121,7 +121,8 @@ pipeline {
script
{
script
{
sh
"git clean -x -d -f > /dev/null 2>&1"
sh
"git clean -x -d -f > /dev/null 2>&1"
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
gitlabMergeRequestLink
=
sh
"curl --silent \"https://gitlab.eurecom.fr/api/v4/projects/oai%2Fcn5g%2Foai-cn5g-nrf/merge_requests/${env.gitlabMergeRequestIid}\" | jq .web_url | sed 's#\"##g'"
gitlabMergeRequestLink
=
sh
returnStdout:
true
,
script:
"curl --silent 'https://gitlab.eurecom.fr/api/v4/projects/oai%2Fcn5g%2Foai-cn5g-nrf/merge_requests/${env.gitlabMergeRequestIid}' | jq .web_url | sed 's#\"##g'"
gitlabMergeRequestLink
=
gitlabMergeRequestLink
.
trim
()
echo
"========= THIS IS A MERGE REQUEST =========="
echo
"========= THIS IS A MERGE REQUEST =========="
echo
"MR ID is ${env.gitlabMergeRequestIid}"
echo
"MR ID is ${env.gitlabMergeRequestIid}"
echo
"MR LINK is ${gitlabMergeRequestLink}"
echo
"MR LINK is ${gitlabMergeRequestLink}"
...
...
ci-scripts/generateHtmlReport.py
View file @
b2077c77
...
@@ -111,7 +111,7 @@ class HtmlReport():
...
@@ -111,7 +111,7 @@ class HtmlReport():
buildSummary
+=
' </tr>
\n
'
buildSummary
+=
' </tr>
\n
'
if
self
.
git_pull_request
:
if
self
.
git_pull_request
:
buildSummary
+=
' <tr>
\n
'
buildSummary
+=
' <tr>
\n
'
buildSummary
+=
' <td bgcolor="lightcyan" > <span class="glyphicon glyphicon-log-out"></span>
Source Branch
</td>
\n
'
buildSummary
+=
' <td bgcolor="lightcyan" > <span class="glyphicon glyphicon-log-out"></span>
Merge Request URL
</td>
\n
'
buildSummary
+=
' <td><a href="TEMPLATE_MERGE_REQUEST_LINK">TEMPLATE_MERGE_REQUEST_LINK</a></td>
\n
'
buildSummary
+=
' <td><a href="TEMPLATE_MERGE_REQUEST_LINK">TEMPLATE_MERGE_REQUEST_LINK</a></td>
\n
'
buildSummary
+=
' </tr>
\n
'
buildSummary
+=
' </tr>
\n
'
buildSummary
+=
' <tr>
\n
'
buildSummary
+=
' <tr>
\n
'
...
...
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