From 39c94c3828af47d8a4c4c090ce0bac6e0566e424 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Mon, 18 Sep 2017 10:58:37 +0100 Subject: CI: Update hugepages configuration Changes introduced by this patch: * Configure more hugepages to be used during CI run. * Fix detection of correct ovs-vswitchd execution. * Skip VPP shutdown overhead in case that VPP execution has failed. Change-Id: Id1badd61334141dcc331691af4a1401a09d06807 Signed-off-by: Martin Klozik --- vswitches/ovs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vswitches/ovs.py') diff --git a/vswitches/ovs.py b/vswitches/ovs.py index 12620e22..7e16c142 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -48,7 +48,8 @@ class IVSwitchOvs(IVSwitch, tasks.Process): self._vswitchd_pidfile_path = os.path.join(settings.getValue('TOOLS')['ovs_var_tmp'], "{}.pid".format(self._proc_name)) self._logger = logging.getLogger(__name__) - self._expect = r'bridge|INFO|{}'.format(self._proc_name) + # sign '|' must be escaped or avoided, otherwise it is handled as 'or' by regex + self._expect = r'bridge.INFO.{}'.format(self._proc_name) self._timeout = 30 self._bridges = {} self._vswitchd_args = ['--pidfile=' + self._vswitchd_pidfile_path, -- cgit 1.2.3-korg