Merge branch 'fix-html-reporting' into 'develop'

CI: appending git summary to all test HTML reports

See merge request oai/cn5g/oai-cn5g-nrf!10

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -121,7 +121,8 @@ pipeline {
         script {
           sh "git clean -x -d -f > /dev/null 2>&1"
           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 "MR ID       is ${env.gitlabMergeRequestIid}"
             echo "MR LINK     is ${gitlabMergeRequestLink}"

ci-scripts/generateHtmlReport.py

@@ -111,7 +111,7 @@ class HtmlReport():
 		buildSummary += '    </tr>\n'
 		if self.git_pull_request:
 			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 += '	 </tr>\n'
 			buildSummary += '	 <tr>\n'
@@ -158,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_nrf.html':
+				continue
 			newEpcReport = open(cwd + '/' + str(reportFile) + '.new', 'w')
 			buildSummaryDone = True
 			with open(cwd + '/' + str(reportFile), 'r') as originalEpcReport: