Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Memif tests failing
[csit.git]
/
resources
/
libraries
/
python
/
ContainerUtils.py
diff --git
a/resources/libraries/python/ContainerUtils.py
b/resources/libraries/python/ContainerUtils.py
index
da9e93a
..
3bf3516
100644
(file)
--- a/
resources/libraries/python/ContainerUtils.py
+++ b/
resources/libraries/python/ContainerUtils.py
@@
-305,6
+305,7
@@
class ContainerEngine(object):
def restart_vpp(self):
"""Restart VPP service inside a container."""
self.execute('supervisorctl restart vpp')
def restart_vpp(self):
"""Restart VPP service inside a container."""
self.execute('supervisorctl restart vpp')
+ self.execute('cat /tmp/supervisord.log')
def create_vpp_startup_config(self,
config_filename='/etc/vpp/startup.conf'):
def create_vpp_startup_config(self,
config_filename='/etc/vpp/startup.conf'):
@@
-627,6
+628,8
@@
class Docker(ContainerEngine):
cpuset_mems = '--cpuset-mems={0}'.format(self.container.cpuset_mems)\
if self.container.cpuset_mems is not None else ''
cpuset_mems = '--cpuset-mems={0}'.format(self.container.cpuset_mems)\
if self.container.cpuset_mems is not None else ''
+ # Temporary workaround - disabling due to bug in memif
+ cpuset_mems = ''
env = '{0}'.format(
' '.join('--env %s' % env for env in self.container.env))\
env = '{0}'.format(
' '.join('--env %s' % env for env in self.container.env))\