aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-01-22 15:31:56 +0000
committerJan Gelety <jgelety@cisco.com>2019-01-24 16:50:56 +0100
commit35ae14a1a109d357bb548e0fb8aaf941ed4a85f2 (patch)
tree160143747e202d84fe592cd2b33dac5188293a3c /tests/vpp
parent552491e8bcff9745b04fbdd92609351ec9597cdc (diff)
CSIT-1407 FIX vpp install after VPP changes
Change-Id: I9148f6de75c3100f827eedec48c4c0ccb343bc54 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp')
-rw-r--r--tests/vpp/device/__init__.robot7
-rw-r--r--tests/vpp/func/__init__.robot9
-rw-r--r--tests/vpp/perf/__init__.robot7
3 files changed, 2 insertions, 21 deletions
diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot
index 8b0788c362..bc13441d99 100644
--- a/tests/vpp/device/__init__.robot
+++ b/tests/vpp/device/__init__.robot
@@ -21,7 +21,6 @@
| Suite Setup | Run Keywords | Setup Global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Install Vpp On All Duts | ${nodes} | ${packages_dir}
-| ... | ${vpp_rpm_pkgs} | ${vpp_deb_pkgs}
| ... | AND | Verify Vpp On All Duts | ${nodes}
| ... | AND | Get CPU Layout from all nodes | ${nodes}
| ... | AND | Update All Interface Data On All Nodes | ${nodes}
@@ -46,9 +45,3 @@
| | Set Global Variable | ${dut_stats} | ${True}
| | Set Global Variable | ${vm_image} | /var/lib/vm/csit-nested-1.7.img
| | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
-| | @{vpp_rpm_pkgs}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins
-| | ... | vpp-api-python
-| | Set Global Variable | ${vpp_rpm_pkgs}
-| | @{vpp_deb_pkgs}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib
-| | ... | vpp-plugins | vpp-api-python
-| | Set Global Variable | ${vpp_deb_pkgs} \ No newline at end of file
diff --git a/tests/vpp/func/__init__.robot b/tests/vpp/func/__init__.robot
index b074d0d5b0..563d1ea363 100644
--- a/tests/vpp/func/__init__.robot
+++ b/tests/vpp/func/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -19,7 +19,6 @@
| Suite Setup | Run Keywords | Setup Functional Global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Install Vpp On All Duts | ${nodes} | ${VPP_PKG_DIR}
-| ... | ${VPP_RPM_PKGS} | ${VPP_DEB_PKGS}
| ... | AND | Verify Vpp On All Duts | ${nodes}
| ... | AND | Setup All DUTs | ${nodes}
| ... | AND | Update All Interface Data On All Nodes | ${nodes}
@@ -34,9 +33,3 @@
| | ... | - vpp_pkg_dir - Path to directory where VPP packages are stored.
| | ...
| | Set Global Variable | ${VPP_PKG_DIR} | /scratch/vpp/
-| | @{VPP_RPM_PKGS}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins
-| | ... | vpp-api-python
-| | Set Global Variable | ${VPP_RPM_PKGS}
-| | @{VPP_DEB_PKGS}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib
-| | ... | vpp-plugins | vpp-api-python
-| | Set Global Variable | ${VPP_DEB_PKGS}
diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 0e24ecda6b..0fb4401871 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -20,7 +20,7 @@
| Suite Setup | Run Keywords | Setup performance global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Install Vpp On All Duts | ${nodes}
-| ... | ${packages_dir} | ${vpp_rpm_pkgs} | ${vpp_deb_pkgs}
+| ... | ${packages_dir}
| ... | AND | Verify Vpp On All Duts | ${nodes}
| ... | AND | Verify UIO Driver on all DUTs | ${nodes}
| ... | AND | Setup All DUTs | ${nodes}
@@ -57,8 +57,3 @@
| | @{plugins_to_enable}= | Create List | dpdk_plugin.so
| | Set Global Variable | @{plugins_to_enable}
| | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
-| | @{vpp_rpm_pkgs}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins
-| | Set Global Variable | ${vpp_rpm_pkgs}
-| | @{vpp_deb_pkgs}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib
-| | ... | vpp-plugins | vpp-api-python
-| | Set Global Variable | ${vpp_deb_pkgs}