diff --git a/ci-scripts/cls_physim.py b/ci-scripts/cls_physim.py index b10c31f566..209611bf6f 100644 --- a/ci-scripts/cls_physim.py +++ b/ci-scripts/cls_physim.py @@ -40,21 +40,13 @@ import re class PhySim: def __init__(self): - self.buildargs = "" self.runargs = "" self.eNBIpAddr = "" self.eNBUserName = "" self.eNBPassWord = "" self.eNBSourceCodePath = "" - self.ranRepository = "" - self.ranBranch = "" - self.ranCommitID= "" - self.ranAllowMerge= "" - self.ranTargetBranch= "" - self.forced_workspace_cleanup=False #private attributes self.__workSpacePath='' - self.__buildLogFile='compile_phy_sim.log' self.__runLogFile='' self.__runLogPath='phy_sim_logs' @@ -123,77 +115,9 @@ class PhySim: HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg]) return success - def __CheckBuild_PhySim(self, HTML, CONST): - self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/' - mySSH = sshconnection.SSHConnection() - mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord) - #retrieve compile log file and store it locally - mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__buildLogFile, '.') - #delete older run log file - mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5) - mySSH.close() - #check build result from local compile log file - with open(self.__buildLogFile) as f: - if 'BUILD SHOULD BE SUCCESSFUL' in f.read(): - HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim') - return True - logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m') - HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC') - HTML.CreateHtmlTabFooter(False) - return False - - #-----------------$ #PUBLIC Methods$ #-----------------$ - - def Build_PhySim(self,htmlObj,constObj): - mySSH = sshconnection.SSHConnection() - mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord) - - #create working dir - mySSH.command('mkdir -p ' + self.eNBSourceCodePath, '\$', 5) - mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5) - - if not self.ranRepository.lower().endswith('.git'): - self.ranRepository+='.git' - - #git clone - mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600) - #git config - mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5) - mySSH.command('git config user.name "OAI Jenkins"', '\$', 5) - - #git clean depending on self.forced_workspace_cleanup captured in xml - if self.forced_workspace_cleanup==True: - logging.info('Cleaning workspace ...') - mySSH.command('echo ' + self.eNBPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30) - else: - logging.info('Workspace cleaning was disabled') - - # if the commit ID is provided, use it to point to it - if self.ranCommitID != '': - mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30) - # if the branch is not develop, then it is a merge request and we need to do - # the potential merge. Note that merge conflicts should have already been checked earlier - if (self.ranAllowMerge): - if self.ranTargetBranch == '': - if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'): - mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30) - else: - logging.info('Merging with the target branch: ' + self.ranTargetBranch) - mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30) - - #build - mySSH.command('source oaienv', '\$', 5) - mySSH.command('cd cmake_targets', '\$', 5) - mySSH.command('mkdir -p log', '\$', 5) - mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500) - - mySSH.close() - return __CheckBuild_PhySim(htmlObj,constObj) - - def Run_CUDATest(self,htmlObj,constObj,testcase_id): self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/' #create run logs folder locally diff --git a/ci-scripts/main.py b/ci-scripts/main.py index b1b0cb77a5..e5c2f221f2 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -289,18 +289,6 @@ def ExecuteActionWithParam(action): st = test.findtext('idle_sleep_time_in_sec') or "5" success = cls_oaicitest.IdleSleep(HTML, int(st)) - elif action == 'Build_PhySim': - ldpc.buildargs = test.findtext('physim_build_args') - forced_workspace_cleanup = test.findtext('forced_workspace_cleanup') - if (forced_workspace_cleanup is None): - ldpc.forced_workspace_cleanup=False - else: - if re.match('true', forced_workspace_cleanup, re.IGNORECASE): - ldpc.forced_workspace_cleanup=True - else: - ldpc.forced_workspace_cleanup=False - success = ldpc.Build_PhySim(HTML,CONST) - elif action == 'Deploy_Run_PhySim': success = PHYSIM.Deploy_PhySim(HTML) diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml index 9b1f7e4bec..27b179c8f8 100755 --- a/ci-scripts/xml_class_list.yml +++ b/ci-scripts/xml_class_list.yml @@ -1,7 +1,6 @@ - Build_Proxy - Build_Cluster_Image - Pull_Cluster_Image - - Build_PhySim - Run_CUDATest - Run_T2Test - Build_eNB diff --git a/ci-scripts/xml_files/physim_build_source.xml b/ci-scripts/xml_files/physim_build_source.xml deleted file mode 100644 index 7ba2a06800..0000000000 --- a/ci-scripts/xml_files/physim_build_source.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - build-offload - Build physical simulators - tasks - 000001 - - - - Build_PhySim - Build physical simulators - --phy_simulators --ninja --noavx512 - FALSE - -