CI: Shorten HTML header

Information about sourceBranch and sourceCommit is already encoded in
the testBranch name, making it redundant in the HTML header.
Also remove the Job Trigger and Target Branch lines, as these parameters
provide limited value and are not particularly relevant for the report.

Signed-off-by: Jaroslava Fiedlerova <jaroslava.fiedlerova@openairinterface.org>

ci-scripts/Jenkinsfile

@@ -114,7 +114,6 @@ pipeline {
             sh """
               python3 main.py --mode=InitiateHtml --repository=${testRepository} \
                               --branch=${testBranch} --commitID=${commitID} \
-                              --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
                               ${mainPythonAllXmlFiles}
             """
             if (runWithOC) {

ci-scripts/args_parse.py

@@ -59,7 +59,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             doMerge = matchReg.group(1)
             if ((doMerge == 'true') or (doMerge == 'True')):
                 RAN.merge=True
-                HTML.merge=True
                 CONTAINERS.merge=True
                 CLUSTER.merge=True
         elif re.match(r'^\-\-branch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
@@ -84,7 +83,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
             else:
                 matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
             RAN.targetBranch=matchReg.group(1)
-            HTML.targetBranch=matchReg.group(1)
             CONTAINERS.targetBranch=matchReg.group(1)
             CLUSTER.targetBranch=matchReg.group(1)
         elif re.match(r'^\-\-workspace=(.+)$|^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):

ci-scripts/cls_oai_html.py

@@ -36,8 +36,6 @@ class HTMLManagement():
 		self.repository = ''
 		self.branch = ''
 		self.commitID = ''
-		self.merge = False
-		self.targetBranch = ''
 
 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -99,44 +97,15 @@ class HTMLManagement():
 			self.htmlFile.write('       <td><a href="' + self.repository + '">' + self.repository + '</a></td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
-			if (self.merge):
-				self.htmlFile.write('       <td>Merge-Request</td>\n')
-			else:
-				self.htmlFile.write('       <td>Push to Branch</td>\n')
-			self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('     <tr>\n')
-			if (self.merge):
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
-			else:
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
+			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Test Branch </td>\n')
 			self.htmlFile.write('       <td>' + self.branch + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
+			commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, shell=True, universal_newlines=True)
+			commit_message = commit_message.strip()
 			self.htmlFile.write('     <tr>\n')
-			if (self.merge):
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
-			else:
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
-			self.htmlFile.write('       <td>' + self.commitID + '</td>\n')
+			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
+			self.htmlFile.write('       <td>' + commit_message + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			if self.merge != '' and self.commitID != 'develop':
-				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, shell=True, universal_newlines=True)
-				commit_message = commit_message.strip()
-				self.htmlFile.write('     <tr>\n')
-				if (self.merge):
-					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
-				else:
-					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
-				self.htmlFile.write('       <td>' + commit_message + '</td>\n')
-				self.htmlFile.write('     </tr>\n')
-			if (self.merge):
-				self.htmlFile.write('     <tr>\n')
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
-				if (self.targetBranch == ''):
-					self.htmlFile.write('       <td>develop</td>\n')
-				else:
-					self.htmlFile.write('       <td>' + self.targetBranch + '</td>\n')
-				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')
 
 			self.htmlFile.write('  <br>\n')

ci-scripts/run_locally.sh

@@ -31,8 +31,6 @@ docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
 docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 
 python3 main.py --mode=InitiateHtml --repository=NONE --branch=${CURRENT_BRANCH} \
-    --ranAllowMerge=false \
-    --targetBranch=NONE \
     --XMLTestFile=xml_files/${TESTCASE} --local --datefmt="%H:%M:%S"
 
 python3 main.py --mode=TesteNB --repository=NONE --branch=${CURRENT_BRANCH} \

ci-scripts/tests/test-runner/run.sh

@@ -11,8 +11,6 @@ python3 main.py \
   --mode=InitiateHtml \
   --repository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
   --branch=${branch} \
-  --ranAllowMerge=true \
-  --targetBranch=develop \
   --XMLTestFile=tests/test-runner/test.xml
 
 python3 main.py \