diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2017-07-13 17:06:06 +0200 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-07-17 11:00:39 +0000 |
| commit | e11000c10e1e9c368eb72df9c5e086c91b25b7a4 (patch) | |
| tree | 95ddadf7da5ddb6ad0b98cbe808000472a7cebb4 /resources/libraries/robot/performance/performance_configuration.robot | |
| parent | c47d76ebbab4e9151484cebf4a5444a9c14f6596 (diff) | |
FIX: remove previous QEMU build when needed to change qsz
Change-Id: I949f8800b45354c205c5a5d36ab2abeeb93409dc
Signed-off-by: Jan Gelety <jgelety@cisco.com>
(cherry picked from commit b4157d62463fc54621fed74b223fcada4811efd1)
Diffstat (limited to 'resources/libraries/robot/performance/performance_configuration.robot')
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 568114f15b..2469799d10 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -1132,8 +1132,9 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} +| | ${force_install}= | Set Variable If | ${qemu_built} | ${False} | ${True} | | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | ... | force_install=${force_install} | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1177,6 +1178,8 @@ | | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number} | | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number} | | | 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] @@ -1213,8 +1216,9 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} +| | ${force_install}= | Set Variable If | ${qemu_built} | ${False} | ${True} | | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | ... | force_install=${force_install} | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1278,8 +1282,9 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} +| | ${force_install}= | Set Variable If | ${qemu_built} | ${False} | ${True} | | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | ... | force_install=${force_install} | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1331,6 +1336,8 @@ | | | ... | ${dut2-vhost-${number}-if2_mac} | skip=${skip_cpus} | | | ... | count=${vm_cpus} | qemu_id=${number} | | | 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] @@ -1369,8 +1376,9 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} +| | ${force_install}= | Set Variable If | ${qemu_built} | ${False} | ${True} | | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | ... | force_install=${force_install} | apply_patch=${apply_patch} | | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 |