From fd6fedc983a7d1796eb2531782be8a37b6d0921d Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Sat, 12 May 2018 15:17:55 +0200
Subject: CSIT-1036 Expose option to install DKMS in container

Expose DKMS installation as suite variable. This will allow to use DPDK
driver for future tests.

Change-Id: I38fd014c8cf6f4bf42881af2196cadc679fe53e0
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot             | 1 +
 .../10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot      | 1 +
 .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot   | 1 +
 .../10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot            | 1 +
 .../container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot   | 1 +
 .../10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot            | 1 +
 .../10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot             | 1 +
 .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot   | 1 +
 .../container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot   | 1 +
 .../40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot            | 1 +
 .../container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot  | 1 +
 .../srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot | 1 +
 .../10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot     | 1 +
 .../10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot     | 1 +
 14 files changed, 14 insertions(+)

(limited to 'tests')

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 2b23565b77..6a07820a9b 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -59,6 +59,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
index b2811f2c10..b180107346 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -67,6 +67,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 7cf5293d3a..faf400450e 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -59,6 +59,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
index 37c6753956..b3824d6b0d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
@@ -67,6 +67,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index 3eb51a1c54..e7cd18e2d2 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -58,6 +58,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
index e81198ede5..91108f8c17 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -66,6 +66,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 680be42e85..83f85da875 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -59,6 +59,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index cd9f6c2aa6..580563a628 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -59,6 +59,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
 | ${container_image}= | ubuntu:xenial-20180412
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index bcc15b4ee5..df8dddb148 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -58,6 +58,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 5f1d49080d..de4e7a9eb1 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -61,6 +61,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index a34dca595d..82b981c30d 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -60,6 +60,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
index 5488d8a935..0c1b93b7d3 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
@@ -96,6 +96,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
index 85089c57a0..798875fb15 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
@@ -96,6 +96,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
index 0c9f57d564..fe0cbe2375 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
@@ -96,6 +96,7 @@
 | ${container_count}= | ${1}
 | ${container_engine}= | LXC
 | ${container_image}= | ${EMPTY}
+| ${container_install_dkms}= | ${FALSE}
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
-- 
cgit 1.2.3-korg