From af58cf2441ea5f1d7665bb09871ba5dc9ac20a04 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 11 Aug 2025 12:27:38 +0200 Subject: [PATCH] CppCheckAnalysis()/LicenceFormattingCheck(): use node - ubuntu18 eNB_IPAddress obelix => obelix - cppcheck eNB_IPAddress 172.21.18.47 => carabe --- ci-scripts/args_parse.py | 3 --- ci-scripts/cls_static_code_analysis.py | 31 ++++++++--------------- ci-scripts/main.py | 6 +++-- ci-scripts/xml_files/cppcheck.xml | 1 + ci-scripts/xml_files/formatting_check.xml | 1 + 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/ci-scripts/args_parse.py b/ci-scripts/args_parse.py index 02d31340cc..7b57409fb0 100644 --- a/ci-scripts/args_parse.py +++ b/ci-scripts/args_parse.py @@ -125,7 +125,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER): matchReg = re.match(r'^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE) RAN.eNBIPAddress=matchReg.group(1) CONTAINERS.eNBIPAddress=matchReg.group(1) - SCA.eNBIPAddress=matchReg.group(1) CLUSTER.eNBIPAddress=matchReg.group(1) elif re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE): matchReg = re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE) @@ -140,7 +139,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER): matchReg = re.match(r'^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE) RAN.eNBUserName=matchReg.group(1) CONTAINERS.eNBUserName=matchReg.group(1) - SCA.eNBUserName=matchReg.group(1) CLUSTER.eNBUserName=matchReg.group(1) elif re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE): matchReg = re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE) @@ -155,7 +153,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER): matchReg = re.match(r'^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE) RAN.eNBPassword=matchReg.group(1) CONTAINERS.eNBPassword=matchReg.group(1) - SCA.eNBPassword=matchReg.group(1) CLUSTER.eNBPassword=matchReg.group(1) elif re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE): matchReg = re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE) diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py index 8b0ec05352..77b0749265 100644 --- a/ci-scripts/cls_static_code_analysis.py +++ b/ci-scripts/cls_static_code_analysis.py @@ -76,25 +76,18 @@ class StaticCodeAnalysis(): self.ranAllowMerge = False self.ranCommitID = '' self.ranTargetBranch = '' - self.eNBIPAddress = '' - self.eNBUserName = '' - self.eNBPassword = '' self.eNBSourceCodePath = '' - def CppCheckAnalysis(self, ctx, HTML): + def CppCheckAnalysis(self, ctx, node, HTML): if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter') - lIpAddr = self.eNBIPAddress - lUserName = self.eNBUserName - lPassWord = self.eNBPassword lSourcePath = self.eNBSourceCodePath - if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': - HELP.GenericHelp(CONST.Version) - sys.exit('Insufficient Parameter') - logging.debug('Building on server: ' + lIpAddr) - cmd = cls_cmd.getConnection(lIpAddr) + if not lSourcePath or not node: + raise ValueError(f"{lSourcePath=} {node=}") + logging.debug('Building on server: ' + node) + cmd = cls_cmd.getConnection(node) self.testCase_id = HTML.testCase_id # on RedHat/CentOS .git extension is mandatory result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository) @@ -184,20 +177,16 @@ class StaticCodeAnalysis(): return True - def LicenceAndFormattingCheck(self, ctx, HTML): + def LicenceAndFormattingCheck(self, ctx, node, HTML): # Workspace is no longer recreated from scratch. # It implies that this method shall be called last within a build pipeline # where workspace is already created - lIpAddr = self.eNBIPAddress - lUserName = self.eNBUserName - lPassWord = self.eNBPassword lSourcePath = self.eNBSourceCodePath - if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': - HELP.GenericHelp(CONST.Version) - sys.exit('Insufficient Parameter') - logging.debug('Building on server: ' + lIpAddr) - cmd = cls_cmd.getConnection(lIpAddr) + if not node or not lSourcePath: + raise ValueError(f"{lSourcePath=} {node=}") + logging.debug('Building on server: ' + node) + cmd = cls_cmd.getConnection(node) self.testCase_id = HTML.testCase_id check_options = '' diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 07c3c0159c..30fe2bd5c9 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -337,10 +337,12 @@ def ExecuteActionWithParam(action, ctx): success = cls_native.Native.Run_Physim(ctx, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold) elif action == 'LicenceAndFormattingCheck': - success = SCA.LicenceAndFormattingCheck(ctx, HTML) + node = test.findtext('node') + success = SCA.LicenceAndFormattingCheck(ctx, node, HTML) elif action == 'Cppcheck_Analysis': - success = SCA.CppCheckAnalysis(ctx, HTML) + node = test.findtext('node') + success = SCA.CppCheckAnalysis(ctx, node, HTML) elif action == 'Push_Local_Registry': node = test.findtext('node') diff --git a/ci-scripts/xml_files/cppcheck.xml b/ci-scripts/xml_files/cppcheck.xml index 3d62f4731f..daab4e01c2 100644 --- a/ci-scripts/xml_files/cppcheck.xml +++ b/ci-scripts/xml_files/cppcheck.xml @@ -37,6 +37,7 @@ Cppcheck_Analysis Static Code Analysis with cppcheck + carabe diff --git a/ci-scripts/xml_files/formatting_check.xml b/ci-scripts/xml_files/formatting_check.xml index bdf47af65d..e54ee1973e 100644 --- a/ci-scripts/xml_files/formatting_check.xml +++ b/ci-scripts/xml_files/formatting_check.xml @@ -32,6 +32,7 @@ LicenceAndFormattingCheck License and Formatting Checks + obelix