Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
911d1b5e
Commit
911d1b5e
authored
Feb 15, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: comment message is now in HTML reports
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
ae58025b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
0 deletions
+38
-0
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+5
-0
ci-scripts/doGitLabMerge.sh
ci-scripts/doGitLabMerge.sh
+1
-0
ci-scripts/reportBuildLocally.sh
ci-scripts/reportBuildLocally.sh
+16
-0
ci-scripts/reportTestLocally.sh
ci-scripts/reportTestLocally.sh
+16
-0
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
911d1b5e
...
...
@@ -104,6 +104,7 @@ pipeline {
}
else
{
echo
"Git Branch is ${GIT_BRANCH}"
echo
"Git Commit is ${GIT_COMMIT}"
sh
"git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
sh
"zip -r -qq localZip.zip ."
// Running astyle options on all C/H files in the repository
...
...
@@ -572,6 +573,10 @@ OAI CI Team''',
replyTo:
'no-reply@openairinterface.org'
,
subject:
'$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
,
to:
env
.
gitlabUserEmail
if
(
fileExists
(
'.git/CI_COMMIT_MSG'
))
{
sh
"rm -f .git/CI_COMMIT_MSG"
}
}
}
success
{
...
...
ci-scripts/doGitLabMerge.sh
View file @
911d1b5e
...
...
@@ -121,6 +121,7 @@ git config user.email "jenkins@openairinterface.org"
git config user.name
"OAI Jenkins"
git checkout
-f
$SOURCE_COMMIT_ID
git log
-n1
--pretty
=
format:
\"
%s
\"
>
.git/CI_COMMIT_MSG
git merge
--ff
$TARGET_COMMIT_ID
-m
"Temporary merge for CI"
...
...
ci-scripts/reportBuildLocally.sh
View file @
911d1b5e
...
...
@@ -363,6 +363,14 @@ function report_build {
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-tag
\"
></span> Commit ID</td>"
>>
./build_results.html
echo
" <td>
$SOURCE_COMMIT_ID
</td>"
>>
./build_results.html
echo
" </tr>"
>>
./build_results.html
if
[
-e
.git/CI_COMMIT_MSG
]
then
echo
" <tr>"
>>
./build_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-comment
\"
></span> Commit Message</td>"
>>
./build_results.html
MSG
=
`
cat
.git/CI_COMMIT_MSG
`
echo
" <td>
$MSG
</td>"
>>
./build_results.html
echo
" </tr>"
>>
./build_results.html
fi
fi
if
[
$MR_TRIG
-eq
1
]
then
...
...
@@ -374,6 +382,14 @@ function report_build {
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-tag
\"
></span> Source Commit ID</td>"
>>
./build_results.html
echo
" <td>
$SOURCE_COMMIT_ID
</td>"
>>
./build_results.html
echo
" </tr>"
>>
./build_results.html
if
[
-e
.git/CI_COMMIT_MSG
]
then
echo
" <tr>"
>>
./build_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-comment
\"
></span> Source Commit Message</td>"
>>
./build_results.html
MSG
=
`
cat
.git/CI_COMMIT_MSG
`
echo
" <td>
$MSG
</td>"
>>
./build_results.html
echo
" </tr>"
>>
./build_results.html
fi
echo
" <tr>"
>>
./build_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-log-in
\"
></span> Target Branch</td>"
>>
./build_results.html
echo
" <td>
$TARGET_BRANCH
</td>"
>>
./build_results.html
...
...
ci-scripts/reportTestLocally.sh
View file @
911d1b5e
...
...
@@ -139,6 +139,14 @@ function report_test {
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-tag
\"
></span> Commit ID</td>"
>>
./test_simulator_results.html
echo
" <td>
$SOURCE_COMMIT_ID
</td>"
>>
./test_simulator_results.html
echo
" </tr>"
>>
./test_simulator_results.html
if
[
-e
.git/CI_COMMIT_MSG
]
then
echo
" <tr>"
>>
./test_simulator_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-comment
\"
></span> Commit Message</td>"
>>
./test_simulator_results.html
MSG
=
`
cat
.git/CI_COMMIT_MSG
`
echo
" <td>
$MSG
</td>"
>>
./test_simulator_results.html
echo
" </tr>"
>>
./test_simulator_results.html
fi
fi
if
[
$MR_TRIG
-eq
1
]
then
...
...
@@ -150,6 +158,14 @@ function report_test {
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-tag
\"
></span> Source Commit ID</td>"
>>
./test_simulator_results.html
echo
" <td>
$SOURCE_COMMIT_ID
</td>"
>>
./test_simulator_results.html
echo
" </tr>"
>>
./test_simulator_results.html
if
[
-e
.git/CI_COMMIT_MSG
]
then
echo
" <tr>"
>>
./test_simulator_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-comment
\"
></span> Commit Message</td>"
>>
./test_simulator_results.html
MSG
=
`
cat
.git/CI_COMMIT_MSG
`
echo
" <td>
$MSG
</td>"
>>
./test_simulator_results.html
echo
" </tr>"
>>
./test_simulator_results.html
fi
echo
" <tr>"
>>
./test_simulator_results.html
echo
" <td bgcolor =
\"
lightcyan
\"
> <span class=
\"
glyphicon glyphicon-log-in
\"
></span> Target Branch</td>"
>>
./test_simulator_results.html
echo
" <td>
$TARGET_BRANCH
</td>"
>>
./test_simulator_results.html
...
...
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