Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
add the expected prompt for ubuntu root user
[csit.git]
/
resources
/
libraries
/
python
/
ContainerUtils.py
diff --git
a/resources/libraries/python/ContainerUtils.py
b/resources/libraries/python/ContainerUtils.py
index
eadc0a8
..
54bbdbb
100644
(file)
--- a/
resources/libraries/python/ContainerUtils.py
+++ b/
resources/libraries/python/ContainerUtils.py
@@
-689,7
+689,10
@@
class Docker(ContainerEngine):
else:
return
else:
return
- cmd = 'docker pull {c.image}'.format(c=self.container)
+ image = self.container.image if self.container.image else\
+ "ubuntu:xenial-20180412"
+
+ cmd = 'docker pull {image}'.format(image=image)
ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800)
if int(ret) != 0:
ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800)
if int(ret) != 0: