From ce7067c7b8b42b5f5a31d7c6e398eb0cf2b07252 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 10 Jan 2019 16:35:13 +0100
Subject: [PATCH] CI: fixing scp timeout failure like the ssh session timeout
failure
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 104 +++++++++++++++++++++++++++------------------
1 file changed, 63 insertions(+), 41 deletions(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index c5c30c8e203..710e06c2c20 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -203,59 +203,81 @@ class SSHConnection():
logging.debug('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')
def copyin(self, ipaddress, username, password, source, destination):
+ count = 0
+ copy_status = False
logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
- scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 5)
- scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- scp_spawn.sendline('yes')
- scp_spawn.expect('password:')
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ while count < 4:
+ scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 5)
+ scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
if scp_response == 0:
- pass
- else:
- logging.debug('1 - scp_response = ' + str(scp_response))
- sys.exit('SCP failed')
- elif scp_response == 1:
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0 or scp_response == 3:
- pass
+ scp_spawn.sendline('yes')
+ scp_spawn.expect('password:')
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('1 - scp_response = ' + str(scp_response))
+ elif scp_response == 1:
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0 or scp_response == 3:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('2 - scp_response = ' + str(scp_response))
+ elif scp_response == 2:
+ count = 10
+ copy_status = True
else:
- logging.debug('2 - scp_response = ' + str(scp_response))
- sys.exit('SCP failed')
- elif scp_response == 2:
+ logging.debug('3 - scp_response = ' + str(scp_response))
+ # adding a tempo when failure
+ if not copy_status:
+ time.sleep(1)
+ count += 1
+ if copy_status:
pass
else:
- logging.debug('3 - scp_response = ' + str(scp_response))
sys.exit('SCP failed')
def copyout(self, ipaddress, username, password, source, destination):
+ count = 0
+ copy_status = False
logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
- scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 5)
- scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- scp_spawn.sendline('yes')
- scp_spawn.expect('password:')
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ while count < 4:
+ scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 5)
+ scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
if scp_response == 0:
- pass
- else:
- logging.debug('1 - scp_response = ' + str(scp_response))
- sys.exit('SCP failed')
- elif scp_response == 1:
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0 or scp_response == 3:
- pass
+ scp_spawn.sendline('yes')
+ scp_spawn.expect('password:')
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('1 - scp_response = ' + str(scp_response))
+ elif scp_response == 1:
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0 or scp_response == 3:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('2 - scp_response = ' + str(scp_response))
+ elif scp_response == 2:
+ count = 10
+ copy_status = True
else:
- logging.debug('2 - scp_response = ' + str(scp_response))
- sys.exit('SCP failed')
- elif scp_response == 2:
+ logging.debug('3 - scp_response = ' + str(scp_response))
+ # adding a tempo when failure
+ if not copy_status:
+ time.sleep(1)
+ count += 1
+ if copy_status:
pass
else:
- logging.debug('3 - scp_response = ' + str(scp_response))
sys.exit('SCP failed')
def BuildeNB(self):
@@ -2061,7 +2083,7 @@ class SSHConnection():
def CreateHtmlTabFooter(self, passStatus):
if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
- self.htmlFile.write(' <tr">\n')
+ self.htmlFile.write(' <tr>\n')
self.htmlFile.write(' <th bgcolor = "#33CCFF" colspan=2>Final Tab Status</th>\n')
if passStatus:
self.htmlFile.write(' <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
--
GitLab