diff options
author | 2018-03-22 13:21:05 +0100 | |
---|---|---|
committer | 2018-03-26 10:37:33 +0000 | |
commit | 095b162010491a4759e05ca46f0e5a47e8ace141 (patch) | |
tree | f47fcd74d591a9532815147e211e37c1d19fdb23 /resources/libraries/robot/performance/performance_configuration.robot | |
parent | 3458e725729098a6c10f68ec4a05d7256984bcdc (diff) |
Optimize Qemu installation to speed up vhost tests
Currently Qemu is being installed if there is a change of qsz parameter
between tests/suites. Qemu is installed always into the same directory. This
patch changes the default behavior to install qemu over and install
pathced version to separate directory. It also disables force install.
Change-Id: I0d7493a02b026a6ae4a5ea8bacf54656de9db567
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/performance/performance_configuration.robot')
-rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 61bc4bd3a4..e544cdd3a3 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -1465,8 +1465,11 @@ | | ... | jumbo_frames=${jumbo_frames} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1516,8 +1519,6 @@ | | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number} | | | ... | jumbo_frames=${jumbo_frames} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} -| | | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | | ... | ${True} | Configure guest VM with dpdk-testpmd using SMT connected via vhost-user | | [Documentation] @@ -1558,8 +1559,11 @@ | | ... | jumbo_frames=${jumbo_frames} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1629,8 +1633,11 @@ | | ... | jumbo_frames=${jumbo_frames} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1688,8 +1695,6 @@ | | | ... | count=${vm_cpus} | qemu_id=${number} | | | ... | jumbo_frames=${jumbo_frames} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} -| | | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | | ... | ${True} | Configure guest VM with dpdk-testpmd-mac using SMT connected via vhost-user | | [Documentation] @@ -1733,8 +1738,11 @@ | | ... | jumbo_frames=${jumbo_frames} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1783,8 +1791,11 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1833,8 +1844,11 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} -| | ... | force_install=${True} | apply_patch=${apply_patch} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin/ +| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut_node} +| | ... | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 |