Commit 9fbc3e86 authored by Raphael Defosseux's avatar Raphael Defosseux

CI: the timeout of eNB log file copy is due to the huge size of said-file

   --> increase the timeout of copyin/copyout functions to 100 sec
   Also changed the UHD driver version retrieval
Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 458a50fb
...@@ -214,7 +214,7 @@ class SSHConnection(): ...@@ -214,7 +214,7 @@ class SSHConnection():
copy_status = False copy_status = False
logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination) logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
while count < 10: while count < 10:
scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 5) scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 100)
scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT]) scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
if scp_response == 0: if scp_response == 0:
scp_spawn.sendline('yes') scp_spawn.sendline('yes')
...@@ -253,7 +253,7 @@ class SSHConnection(): ...@@ -253,7 +253,7 @@ class SSHConnection():
copy_status = False copy_status = False
logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination) logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
while count < 4: while count < 4:
scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 5) scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 100)
scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT]) scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
if scp_response == 0: if scp_response == 0:
scp_spawn.sendline('yes') scp_spawn.sendline('yes')
...@@ -1977,8 +1977,8 @@ class SSHConnection(): ...@@ -1977,8 +1977,8 @@ class SSHConnection():
if result is not None: if result is not None:
self.eNBKernelVersion = result.group('kernel_version') self.eNBKernelVersion = result.group('kernel_version')
logging.debug('Kernel Version is: ' + self.eNBKernelVersion) logging.debug('Kernel Version is: ' + self.eNBKernelVersion)
self.command('dpkg --list | egrep --color=never uhd-host', '\$', 5) self.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
result = re.search('uhd-host *(?P<uhd_version>[0-9\.]+)', str(self.ssh.before)) result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', str(self.ssh.before))
if result is not None: if result is not None:
self.eNBUhdVersion = result.group('uhd_version') self.eNBUhdVersion = result.group('uhd_version')
logging.debug('UHD Version is: ' + self.eNBUhdVersion) logging.debug('UHD Version is: ' + self.eNBUhdVersion)
......
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