[CI] update on report for the RHEL build

Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>

ci-scripts/generateHtmlReport.py

@@ -153,7 +153,7 @@ class HtmlReport():
 			buildSummaryDone = True
 			with open(cwd + '/ds_tester_results_oai_cn5g.html', 'r') as originalEpcReport:
 				for line in originalEpcReport:
-					result = re.search('DS Tester Summary', line)
+					result = re.search('Deployment Summary', line)
 					if (result is not None) and buildSummaryDone:
 						newEpcReport.write(buildSummary)
 						buildSummaryDone = False
@@ -366,12 +366,13 @@ class HtmlReport():
 			self.file.write('  </div>\n')
 
 	def buildSummaryHeader(self):
-		self.file.write('  <h2>Docker Image Build Summary</h2>\n')
+		self.file.write('  <h2>Docker / Podman Image Build Summary</h2>\n')
 		self.file.write('  <table class="table-bordered" width = "100%" align = "center" border = "1">\n')
 		self.file.write('     <tr bgcolor="#33CCFF" >\n')
 		self.file.write('   	<th>Stage Name</th>\n')
 		self.file.write('   	<th>Image Kind</th>\n')
-		self.file.write('   	<th>OAI AMF cNF</th>\n')
+		self.file.write('		<th>OAI AMF <font color="Gold">Ubuntu18</font> Image</th>\n')
+		self.file.write('		<th>OAI AMF <font color="Gold">RHEL8</font> Image</th>\n')
 		self.file.write('     </tr>\n')
 
 	def buildSummaryFooter(self):
@@ -401,13 +402,14 @@ class HtmlReport():
 	def analyze_docker_build_git_part(self, nfType):
 		if nfType != 'AMF':
 			self.file.write('      <td>N/A</td>\n')
-			self.file.write('      <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('      <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		logFileName = 'amf_docker_image_build.log'
 		self.file.write('      <td>Builder Image</td>\n')
-
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'amf_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				status = False
 				section_start_pattern = 'git config --global http'
@@ -447,13 +449,15 @@ class HtmlReport():
 	def analyze_install_log(self, nfType):
 		if nfType != 'AMF':
 			self.file.write('      <td>N/A</td>\n')
-			self.file.write('      <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('      <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		logFileName = 'amf_docker_image_build.log'
 		self.file.write('      <td>Builder Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				status = False
 				section_start_pattern = 'build_amf --install-deps --force'
@@ -563,15 +567,16 @@ class HtmlReport():
 		if nfType != 'AMF':
 			if imageKind:
 				self.file.write('      <td>N/A</td>\n')
-			self.file.write('	   <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('	   <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		if nfType == 'AMF':
-			logFileName = 'amf_docker_image_build.log'
 		if imageKind:
 			self.file.write('      <td>Builder Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				status = False
 				if nfType == 'AMF':
@@ -612,15 +617,15 @@ class HtmlReport():
 			self.file.write('	   <td>Wrong NF Type for this Report</td>\n')
 			return
 
-		if nfType == 'AMF':
-			logFileName = 'amf_docker_image_build.log'
 		if imageKind:
 			self.file.write('      <td>Builder Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			nb_errors = 0
 			nb_warnings = 0
-
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				if nfType == 'AMF':
 					section_start_pattern = 'build_amf --clean --Verbose --build-type Release --jobs'
@@ -675,13 +680,15 @@ class HtmlReport():
 	def analyze_copy_log(self, nfType):
 		if nfType != 'AMF':
 			self.file.write('      <td>N/A</td>\n')
-			self.file.write('	   <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('	   <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		logFileName = 'amf_docker_image_build.log'
 		self.file.write('      <td>Target Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				section_start_pattern = 'FROM ubuntu:bionic as oai-amf$'
 				section_end_pattern = 'WORKDIR /openair-amf/etc'
@@ -719,13 +726,15 @@ class HtmlReport():
 	def analyze_copy_conf_tool_log(self, nfType):
 		if nfType != 'AMF':
 			self.file.write('      <td>N/A</td>\n')
-			self.file.write('	   <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('	   <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		logFileName = 'amf_docker_image_build.log'
 		self.file.write('      <td>Target Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				section_start_pattern = 'WORKDIR /openair-amf/etc'
 				section_end_pattern = 'Successfully tagged oai-amf'
@@ -764,15 +773,16 @@ class HtmlReport():
 		if nfType != 'AMF':
 			if imageKind:
 				self.file.write('      <td>N/A</td>\n')
-			self.file.write('	   <td>Wrong NF Type for this Report</td>\n')
+			self.file.write('	   <td colspan="2">Wrong NF Type for this Report</td>\n')
 			return
 
-		if nfType == 'AMF':
-			logFileName = 'amf_docker_image_build.log'
 		if imageKind:
 			self.file.write('      <td>Target Image</td>\n')
 
 		cwd = os.getcwd()
+		variants = ['docker', 'podman']
+		for variant in variants:
+			logFileName = 'spgwu_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				if nfType == 'AMF':
 					section_start_pattern = 'Successfully tagged oai-amf'