aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/ContainerUtils.py
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-04-18 11:11:19 +0200
committerPeter Mikus <pmikus@cisco.com>2018-04-19 06:11:29 +0000
commit30c94055dd6ec2fe1cb83455cf6eb4bca8648d45 (patch)
treeae2722e99e6fb082d5f7d95b2e23d257af3f31fa /resources/libraries/python/ContainerUtils.py
parent6942369b1102a8b9a3b705f9192f1ecb959382d1 (diff)
FIX: Memif tests failing
- CSIT-1049 Change-Id: I073c1e6d8cdda835fbb955cbf79e982bc2cc6228 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python/ContainerUtils.py')
-rw-r--r--resources/libraries/python/ContainerUtils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py
index da9e93ae10..3bf3516e6d 100644
--- 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')
+ self.execute('cat /tmp/supervisord.log')
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 ''
+ # Temporary workaround - disabling due to bug in memif
+ cpuset_mems = ''
env = '{0}'.format(
' '.join('--env %s' % env for env in self.container.env))\