aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VPP_STABLE_VER_CENTOS2
-rw-r--r--VPP_STABLE_VER_UBUNTU2
-rw-r--r--VPP_STABLE_VER_UBUNTU_BIONIC2
-rw-r--r--resources/libraries/python/Constants.py3
-rw-r--r--resources/libraries/python/VPPUtil.py4
5 files changed, 9 insertions, 4 deletions
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS
index 8066a366ad..1d9ae2d8b0 100644
--- a/VPP_STABLE_VER_CENTOS
+++ b/VPP_STABLE_VER_CENTOS
@@ -1 +1 @@
-20.01-rc0~210_g5c29029~b7820
+20.01-rc0~324_g66a332c~b7936
diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU
index df208464a2..0cc3a8a5b9 100644
--- a/VPP_STABLE_VER_UBUNTU
+++ b/VPP_STABLE_VER_UBUNTU
@@ -1 +1 @@
-20.01-rc0~210-g5c29029~b8007
+20.01-rc0~324-g66a332c~b8122
diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC
index 7cecdc2967..768e292d0e 100644
--- a/VPP_STABLE_VER_UBUNTU_BIONIC
+++ b/VPP_STABLE_VER_UBUNTU_BIONIC
@@ -1 +1 @@
-20.01-rc0~210-g5c29029ef
+20.01-rc0~324-g66a332cf1
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 57176662eb..5b7e1cda57 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -229,7 +229,8 @@ class Constants(object):
SOCKSTAT_PATH = "/run/vpp/stats.sock"
# Global "kill switch" for CRC checking during runtime.
- FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH")
+ # FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH")
+ FAIL_ON_CRC_MISMATCH = False
# Mapping from NIC name to its bps limit.
# TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index 6e3ff707ea..432a589cd3 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -112,6 +112,10 @@ class VPPUtil(object):
:param node: Topology node.
:type node: dict
"""
+ cmd = 'echo "show pci" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock'
+ exec_cmd_no_error(
+ node, cmd, sudo=False, message='VPP failed to start!', retries=120)
+
cmd = ('vppctl show pci 2>&1 | '
'fgrep -v "Connection refused" | '
'fgrep -v "No such file or directory"')