diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-07-30 17:28:16 +0000 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2018-08-10 09:16:13 +0000 |
| commit | 325bf96ce5fc13780fab0731855a2e2092208a2b (patch) | |
| tree | 16c8c679c890dc7e0f18ec63a7a3f6c39cbec4cd /tests | |
| parent | 8f5f344d59674ea4c158e8ff1528716276f5b071 (diff) | |
CSIT-1193 De-duplicate bootstrap scripts into one
- DPDK and VPP bootstrap merged into one (ligato will follow).
- Added more error detections
- Added topo-cleanup.py to cleanup TB before and after test.
- Remove installation of VPP
Change-Id: I7a86117eb03cbe4ee8fde47baeed58bc86c0dfb2
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dpdk/dpdk_scripts/install_dpdk.sh | 2 | ||||
| -rw-r--r-- | tests/vpp/perf/__init__.robot | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/dpdk/dpdk_scripts/install_dpdk.sh b/tests/dpdk/dpdk_scripts/install_dpdk.sh index 4fcbf080d9..ec23aa06b1 100755 --- a/tests/dpdk/dpdk_scripts/install_dpdk.sh +++ b/tests/dpdk/dpdk_scripts/install_dpdk.sh @@ -21,7 +21,7 @@ PWDDIR=$(pwd) cd ${ROOTDIR} mkdir ${DPDK_DIR} -tar -xvf dpdk*.tar.xz --strip=1 --directory dpdk || \ +tar -xvf download_dir/dpdk*.tar.xz --strip=1 --directory dpdk || \ { echo "Failed to extract DPDK"; exit 1; } # Compile the DPDK diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot index b847d8130b..ecee11c09f 100644 --- a/tests/vpp/perf/__init__.robot +++ b/tests/vpp/perf/__init__.robot @@ -19,6 +19,9 @@ | Library | resources.libraries.python.CpuUtils | 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} +| ... | AND | Verify Vpp On All Duts | ${nodes} | ... | AND | Verify UIO Driver on all DUTs | ${nodes} | ... | AND | Setup All DUTs | ${nodes} | ... | AND | Show Vpp Version On All Duts | ${nodes} @@ -54,3 +57,9 @@ | | Set Global Variable | ${dut_stats} | ${True} | | @{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-dpdk-dkms +| | Set Global Variable | ${vpp_deb_pkgs} |