From 4f46622383994e2092042624d2dad31b7456b275 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Fri, 14 Oct 2022 14:31:39 +0200 Subject: [PATCH] fix(ci): forgot to add HTML rows to test-report Signed-off-by: Raphael Defosseux --- ci-scripts/cls_containerize.py | 15 +++++++++++++++ ci-scripts/main.py | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 1b756b84c3..4692574709 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -652,6 +652,8 @@ class Containerize(): mySSH.command('echo oaicicd | docker login --password-stdin -u oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Login Succeeded', mySSH.getBefore()) is None: logging.error('Could not log into local registry') + mySSH.close() + HTML.CreateHtmlTestRow('Could not log into local registry', 'KO', CONST.ALL_PROCESSES_OK) return False orgTag = 'develop' @@ -665,15 +667,20 @@ class Containerize(): if re.search(': digest:', mySSH.getBefore()) is None: logging.debug(mySSH.getBefore()) logging.error(f'Could not push {image} to local registry : {tagToUse}') + mySSH.close() + HTML.CreateHtmlTestRow(f'Could not push {image} to local registry : {tagToUse}', 'KO', CONST.ALL_PROCESSES_OK) return False mySSH.command(f'docker rmi {tagToUse}', '\$', 5) mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Removing login credentials', mySSH.getBefore()) is None: logging.error('Could not log off from local registry') + mySSH.close() + HTML.CreateHtmlTestRow('Could not log off from local registry', 'KO', CONST.ALL_PROCESSES_OK) return False mySSH.close() + HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True def Pull_Image_from_Local_Registry(self, HTML): @@ -702,6 +709,8 @@ class Containerize(): mySSH.command('echo oaicicd | docker login --password-stdin -u oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Login Succeeded', mySSH.getBefore()) is None: logging.error('Could not log into local registry') + mySSH.close() + HTML.CreateHtmlTestRow('Could not log into local registry', 'KO', CONST.ALL_PROCESSES_OK) return False orgTag = 'develop' @@ -714,14 +723,19 @@ class Containerize(): if re.search('Status: Downloaded newer image for |Status: Image is up to date for', mySSH.getBefore()) is None: logging.debug(mySSH.getBefore()) logging.error(f'Could not pull {image} from local registry : {tagToUse}') + mySSH.close() + HTML.CreateHtmlTestRow(f'Could not pull {image} from local registry : {tagToUse}', 'KO', CONST.ALL_PROCESSES_OK) return False mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Removing login credentials', mySSH.getBefore()) is None: logging.error('Could not log off from local registry') + mySSH.close() + HTML.CreateHtmlTestRow('Could not log off from local registry', 'KO', CONST.ALL_PROCESSES_OK) return False mySSH.close() + HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True def Clean_Test_Server_Images(self, HTML): @@ -757,6 +771,7 @@ class Containerize(): mySSH.command(f'docker rmi {tagToUse} || true', '\$', 5) mySSH.close() + HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True def DeployObject(self, HTML, EPC): diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 9c7bab4efd..67957b7fba 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -1015,14 +1015,14 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re HTML.testStabilityPointReached = True CiTestObj.FailReportCnt += 1 if CiTestObj.FailReportCnt == CiTestObj.repeatCounts[0] and RAN.prematureExit: - logging.error('Scenario failed ' + str(CiTestObj.FailReportCnt) + ' time(s)') + logging.error('\u001B[1;37;41mScenario failed ' + str(CiTestObj.FailReportCnt) + ' time(s)\u001B[0m') HTML.CreateHtmlTabFooter(False) if CiTestObj.testUnstable and (CiTestObj.testStabilityPointReached or CiTestObj.testMinStableId == '999999'): - logging.warning('Scenario has reached minimal stability point -- Not a Failure') + logging.warning('\u001B[1;30;43mScenario has reached minimal stability point -- Not a Failure\u001B[0m') else: sys.exit('Failed Scenario') else: - logging.info('Scenario passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)') + logging.info('\u001B[1;37;42mScenario passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)\u001B[0m') HTML.CreateHtmlTabFooter(True) elif re.match('^LoadParams$', mode, re.IGNORECASE): pass