CI: fix missing artifact

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -467,6 +467,10 @@ pipeline {
             sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' *_results_oai_cn5g.html"
             sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' *_results_oai_cn5g.html"
           }
+          if (fileExists('test_results_oai_amf_bt.html')) {
+            sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' *_results_oai_amf_bt.html"
+            sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' *_results_oai_amf_bt.html"
+          }
         } else {
           sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
         }
@@ -479,6 +483,10 @@ pipeline {
           sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' *_results_oai_cn5g.html"
           archiveArtifacts artifacts: '*_results_oai_cn5g.html'
         }
+        if (fileExists('test_results_oai_amf_bt.html')) {
+          sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' *_results_oai_amf_bt.html"
+          archiveArtifacts artifacts: '*_results_oai_amf_bt.html'
+        }
 
         // Sending email to commiter
         if (params.sendToCommitterEmail != null) {

ci-scripts/generateHtmlReport.py

@@ -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_amf.html':
+				continue
 			newEpcReport = open(cwd + '/' + str(reportFile) + '.new', 'w')
 			buildSummaryDone = True
 			with open(cwd + '/' + str(reportFile), 'r') as originalEpcReport:
@@ -461,8 +463,6 @@ class HtmlReport():
 				section_end_pattern = 'build_amf --clean --Verbose --build-type Release --jobs'
 				section_status = False
 				package_install = False
-				fmt_build_start = False
-				fmt_build_status = False
 				folly_build_start = False
 				folly_build_status = False
 				spdlog_build_start = False
@@ -498,12 +498,6 @@ class HtmlReport():
 							result = re.search('cpprestsdk installation complete', line)
 							if result is not None and cpprest_build_start:
 								cpprest_build_status = True
-							result = re.search('Starting to install fmt', line)
-							if result is not None:
-								fmt_build_start = True
-							result = re.search('fmt installation complete', line)
-							if result is not None and fmt_build_start:
-								fmt_build_status = True
 							result = re.search('Starting to install folly', line)
 							if result is not None:
 								folly_build_start = True
@@ -551,12 +545,6 @@ class HtmlReport():
 					cell_msg += '   ** cpprestsdk Installation: OK\n'
 				else:
 					cell_msg += '   ** cpprestsdk Installation: KO\n'
-				if base_image:
-					cell_msg += '   ** fmt Installation: N/A\n'
-				elif fmt_build_status:
-					cell_msg += '   ** fmt Installation: OK\n'
-				else:
-					cell_msg += '   ** fmt Installation: KO\n'
 				if base_image:
 					cell_msg += '   ** folly Installation: N/A\n'
 				elif folly_build_status: