Commit 497c6110 authored by Remi Hardy's avatar Remi Hardy

update 1 after review

parent a9dbcf6b
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
# pexpect # pexpect
#--------------------------------------------------------------------- #---------------------------------------------------------------------
#to use logging.info()
import logging
#to create a SSH object locally in the methods #to create a SSH object locally in the methods
import sshconnection import sshconnection
#to update the HTML object #to update the HTML object
...@@ -50,7 +52,7 @@ class PhySim: ...@@ -50,7 +52,7 @@ class PhySim:
self.exitStatus=0 self.exitStatus=0
#private attributes #private attributes
self.__workSpacePath='' self.__workSpacePath=''
self.__buildLogFile='compile_oai_enb.log' self.__buildLogFile='compile_phy_sim.log'
self.__runLogFile='ldpctest_run_results.log' self.__runLogFile='ldpctest_run_results.log'
self.__runResults=[] self.__runResults=[]
...@@ -101,7 +103,7 @@ class PhySim: ...@@ -101,7 +103,7 @@ class PhySim:
HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC') HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC')
self.exitStatus=0 self.exitStatus=0
else: 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.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
HTML.CreateHtmlTabFooter(False) HTML.CreateHtmlTabFooter(False)
#exitStatus=1 will do a sys.exit in main #exitStatus=1 will do a sys.exit in main
...@@ -143,7 +145,7 @@ class PhySim: ...@@ -143,7 +145,7 @@ class PhySim:
if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'): if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5) mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
else: 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) mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
#build #build
......
...@@ -3517,7 +3517,7 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE): ...@@ -3517,7 +3517,7 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
foundCount += 1 foundCount += 1
count += 1 count += 1
if foundCount != HTML.GetnbTestXMLfiles(): if foundCount != HTML.GetnbTestXMLfiles():
HTML.SetnbTestXMLfiles(foundcount) HTML.SetnbTestXMLfiles(foundCount)
if (CiTestObj.ADBIPAddress != 'none'): if (CiTestObj.ADBIPAddress != 'none'):
terminate_ue_flag = False terminate_ue_flag = False
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<testCase id="000001"> <testCase id="000001">
<class>Build_PhySim</class> <class>Build_PhySim</class>
<desc>Build for physical simulator</desc> <desc>Build for physical simulator</desc>
<physim_build_args>--phy_simulators</physim_build_args> <physim_build_args>--phy_simulators --ninja</physim_build_args>
</testCase> </testCase>
<testCase id="000002"> <testCase id="000002">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment