diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/ContainerUtils.py | 12 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index ae4e01eba7..4d5f8ee4d6 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -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'. diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index a3d7c99392..b44e4386a6 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -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 |