CSIT-1036 Expose option to install DKMS in container 52/12552/7
authorPeter Mikus <pmikus@cisco.com>
Sat, 12 May 2018 13:17:55 +0000 (15:17 +0200)
committerPeter Mikus <pmikus@cisco.com>
Mon, 14 May 2018 11:37:31 +0000 (11:37 +0000)
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>
16 files changed:
resources/libraries/python/ContainerUtils.py
resources/libraries/robot/shared/container.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot

index ae4e01e..4d5f8ee 100644 (file)
@@ -279,17 +279,11 @@ class ContainerEngine(object):
         self.execute('supervisord -c {config_file}'.
                      format(config_file=SUPERVISOR_CONF))
 
-    def install_vpp(self, install_dkms=False):
-        """Install VPP inside a container.
-
-        :param install_dkms: If install dkms package. This will impact
-            install time. Dkms is required for installation of vpp-dpdk-dkms.
-            Default is false.
-        :type install_dkms: bool
-        """
+    def install_vpp(self):
+        """Install VPP inside a container."""
         self.execute('ln -s /dev/null /etc/sysctl.d/80-vpp.conf')
         self.execute('apt-get update')
-        if install_dkms:
+        if self.container.install_dkms:
             self.execute(
                 'apt-get install -y dkms && '
                 'dpkg -i --force-all {guest_dir}/install_dir/*.deb'.
index a3d7c99..b44e438 100644 (file)
@@ -36,6 +36,7 @@
 | | | ... | image=${container_image} | cpu_count=${container_cpus}
 | | | ... | cpu_skip=${skip_cpus} | smt_used=${False} | cpuset_mems=${cpu_node}
 | | | ... | cpu_shared=${False} | env=${env} | count=${container_count}
+| | | ... | install_dkms=${container_install_dkms}
 | | Append To List | ${container_groups} | ${group}
 
 | Construct ETCD containers on all DUTs
index 2b23565..6a07820 100644 (file)
@@ -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}
index b2811f2..b180107 100644 (file)
@@ -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}
index 7cf5293..faf4004 100644 (file)
@@ -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}
index 37c6753..b3824d6 100644 (file)
@@ -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}
index 3eb51a1..e7cd18e 100644 (file)
@@ -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}
index e81198e..91108f8 100644 (file)
@@ -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}
index 680be42..83f85da 100644 (file)
@@ -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}
index cd9f6c2..580563a 100644 (file)
@@ -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}
index bcc15b4..df8dddb 100644 (file)
@@ -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}
index 5f1d490..de4e7a9 100644 (file)
@@ -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}
index a34dca5..82b981c 100644 (file)
@@ -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}
index 5488d8a..0c1b93b 100644 (file)
@@ -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}
index 85089c5..798875f 100644 (file)
@@ -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}
index 0c9f57d..fe0cbe2 100644 (file)
@@ -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}

©2016 FD.io a Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered trademark of Linus Torvalds.
Please see our privacy policy and terms of use.