Merge branch 'fix-ci' into 'develop'

CI: fix Merge Request URL recovery

See merge request !78

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-smf/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-smf/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

@@ -852,12 +852,11 @@ class HtmlReport():
 								else:
 									result = re.search('oai-smf *develop', line)
 							if result is not None:
-								if variant == 'docker':
-									result = re.search('ago *([0-9A-Z]+)', line)
-								else:
-									result = re.search('ago *([0-9]+ [A-Z]+)', line)
+								result = re.search('ago  *([0-9A-Z ]+)', line)
 								if result is not None:
 									size = result.group(1)
+									if variant == 'docker':
+										size = re.sub('MB', ' MB', size)
 									status = True
 					logfile.close()
 				if status: