diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index 18c208359e..f59208ed8b 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -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 { diff --git a/ci-scripts/doGitLabMerge.sh b/ci-scripts/doGitLabMerge.sh index 852b6407ea..6c9ee12b4e 100755 --- a/ci-scripts/doGitLabMerge.sh +++ b/ci-scripts/doGitLabMerge.sh @@ -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" diff --git a/ci-scripts/reportBuildLocally.sh b/ci-scripts/reportBuildLocally.sh index e2259da48a..08d2f78443 100755 --- a/ci-scripts/reportBuildLocally.sh +++ b/ci-scripts/reportBuildLocally.sh @@ -363,6 +363,14 @@ function report_build { echo " Commit ID" >> ./build_results.html echo " $SOURCE_COMMIT_ID" >> ./build_results.html echo " " >> ./build_results.html + if [ -e .git/CI_COMMIT_MSG ] + then + echo " " >> ./build_results.html + echo " Commit Message" >> ./build_results.html + MSG=`cat .git/CI_COMMIT_MSG` + echo " $MSG" >> ./build_results.html + echo " " >> ./build_results.html + fi fi if [ $MR_TRIG -eq 1 ] then @@ -374,6 +382,14 @@ function report_build { echo " Source Commit ID" >> ./build_results.html echo " $SOURCE_COMMIT_ID" >> ./build_results.html echo " " >> ./build_results.html + if [ -e .git/CI_COMMIT_MSG ] + then + echo " " >> ./build_results.html + echo " Source Commit Message" >> ./build_results.html + MSG=`cat .git/CI_COMMIT_MSG` + echo " $MSG" >> ./build_results.html + echo " " >> ./build_results.html + fi echo " " >> ./build_results.html echo " Target Branch" >> ./build_results.html echo " $TARGET_BRANCH" >> ./build_results.html diff --git a/ci-scripts/reportTestLocally.sh b/ci-scripts/reportTestLocally.sh index 004e021de1..63dc724b84 100755 --- a/ci-scripts/reportTestLocally.sh +++ b/ci-scripts/reportTestLocally.sh @@ -139,6 +139,14 @@ function report_test { echo " Commit ID" >> ./test_simulator_results.html echo " $SOURCE_COMMIT_ID" >> ./test_simulator_results.html echo " " >> ./test_simulator_results.html + if [ -e .git/CI_COMMIT_MSG ] + then + echo " " >> ./test_simulator_results.html + echo " Commit Message" >> ./test_simulator_results.html + MSG=`cat .git/CI_COMMIT_MSG` + echo " $MSG" >> ./test_simulator_results.html + echo " " >> ./test_simulator_results.html + fi fi if [ $MR_TRIG -eq 1 ] then @@ -150,6 +158,14 @@ function report_test { echo " Source Commit ID" >> ./test_simulator_results.html echo " $SOURCE_COMMIT_ID" >> ./test_simulator_results.html echo " " >> ./test_simulator_results.html + if [ -e .git/CI_COMMIT_MSG ] + then + echo " " >> ./test_simulator_results.html + echo " Commit Message" >> ./test_simulator_results.html + MSG=`cat .git/CI_COMMIT_MSG` + echo " $MSG" >> ./test_simulator_results.html + echo " " >> ./test_simulator_results.html + fi echo " " >> ./test_simulator_results.html echo " Target Branch" >> ./test_simulator_results.html echo " $TARGET_BRANCH" >> ./test_simulator_results.html