diff --git a/ci-scripts/cls_physim.py b/ci-scripts/cls_physim.py index baf8144f88..99c6342697 100644 --- a/ci-scripts/cls_physim.py +++ b/ci-scripts/cls_physim.py @@ -27,6 +27,8 @@ # pexpect #--------------------------------------------------------------------- +#to use logging.info() +import logging #to create a SSH object locally in the methods import sshconnection #to update the HTML object @@ -50,7 +52,7 @@ class PhySim: self.exitStatus=0 #private attributes self.__workSpacePath='' - self.__buildLogFile='compile_oai_enb.log' + self.__buildLogFile='compile_phy_sim.log' self.__runLogFile='ldpctest_run_results.log' self.__runResults=[] @@ -101,7 +103,7 @@ class PhySim: HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC') self.exitStatus=0 else: - logging.error('\u001B[1m Building OAI UE Failed\u001B[0m') + logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m') HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC') HTML.CreateHtmlTabFooter(False) #exitStatus=1 will do a sys.exit in main @@ -143,7 +145,7 @@ class PhySim: if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'): mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5) else: - print('Merging with the target branch: ' + self.ranTargetBranch) + logging.info('Merging with the target branch: ' + self.ranTargetBranch) mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5) #build diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 164b4fc6af..ed2a56e688 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -3517,7 +3517,7 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE): foundCount += 1 count += 1 if foundCount != HTML.GetnbTestXMLfiles(): - HTML.SetnbTestXMLfiles(foundcount) + HTML.SetnbTestXMLfiles(foundCount) if (CiTestObj.ADBIPAddress != 'none'): terminate_ue_flag = False diff --git a/ci-scripts/xml_files/rh_ldpc_gpu_test.xml b/ci-scripts/xml_files/ldpc_gpu_test.xml similarity index 96% rename from ci-scripts/xml_files/rh_ldpc_gpu_test.xml rename to ci-scripts/xml_files/ldpc_gpu_test.xml index 6df90915d3..4d398bc995 100644 --- a/ci-scripts/xml_files/rh_ldpc_gpu_test.xml +++ b/ci-scripts/xml_files/ldpc_gpu_test.xml @@ -32,7 +32,7 @@ Build_PhySim Build for physical simulator - --phy_simulators + --phy_simulators --ninja