From f75e107d0854afc7478c50d4ebc410aa0981748e Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Wed, 16 Oct 2024 12:14:38 +0200 Subject: [PATCH] CI: remove unused Run_NRulsimTest --- ci-scripts/cls_physim.py | 38 ----------------------------------- ci-scripts/main.py | 4 +--- ci-scripts/xml_class_list.yml | 1 - 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/ci-scripts/cls_physim.py b/ci-scripts/cls_physim.py index ccdd34e9a9..b10c31f566 100644 --- a/ci-scripts/cls_physim.py +++ b/ci-scripts/cls_physim.py @@ -123,33 +123,6 @@ class PhySim: HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg]) return success - def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id): - #retrieve run log file and store it locally - mySSH = sshconnection.SSHConnection() - filename = self.__workSpacePath + self.__runLogFile - ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.') - if ret != 0: - error_msg = f'could not recover test result file {filename}' - logging.error(error_msg) - HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg]) - return False - - PUSCH_OK = False - with open(self.__runLogFile) as f: - PUSCH_OK = 'PUSCH test OK' in f.read() - - # once parsed move the local logfile to its folder for tidiness - os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.') - - #updating the HTML with results - if PUSCH_OK: - HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"]) - else: - error_msg = 'error: no "PUSCH test OK"' - logging.error(error_msg) - HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg]) - return PUSCH_OK - def __CheckBuild_PhySim(self, HTML, CONST): self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/' mySSH = sshconnection.SSHConnection() @@ -249,14 +222,3 @@ class PhySim: mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1') mySSH.close() return self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id) - - def Run_NRulsimTest(self, htmlObj, constObj, testcase_id): - self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/' - os.system(f'mkdir -p ./{self.__runLogPath}') - self.__runLogFile = f'physim_{testcase_id}.log' - mySSH = sshconnection.SSHConnection() - mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord) - mySSH.command(f'cd {self.__workSpacePath}', '\$', 5) - mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30) - mySSH.close() - return self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 3904ac908d..b1b0cb77a5 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -377,14 +377,12 @@ def ExecuteActionWithParam(action): elif action == 'Create_Workspace': success = CONTAINERS.Create_Workspace(HTML) - elif action == 'Run_CUDATest' or action == 'Run_NRulsimTest' or action == 'Run_T2Test': + elif action == 'Run_CUDATest' or action == 'Run_T2Test': ldpc.runargs = test.findtext('physim_run_args') ldpc.runsim = test.findtext('physim_run') ldpc.timethrs = test.findtext('physim_time_threshold') if action == 'Run_CUDATest': success = ldpc.Run_CUDATest(HTML,CONST,id) - elif action == 'Run_NRulsimTest': - success = ldpc.Run_NRulsimTest(HTML,CONST,id) elif action == 'Run_T2Test': success = ldpc.Run_T2Test(HTML,CONST,id) diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml index 325797c29e..9b1f7e4bec 100755 --- a/ci-scripts/xml_class_list.yml +++ b/ci-scripts/xml_class_list.yml @@ -4,7 +4,6 @@ - Build_PhySim - Run_CUDATest - Run_T2Test - - Run_NRulsimTest - Build_eNB - Initialize_eNB - Terminate_eNB