diff options
| author |   pmikus <pmikus@cisco.com> | 2016-10-17 14:28:57 +0200 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2016-10-24 10:29:24 +0000 |
| commit | d0a388627a90c526ae6e6d87ca00d428ed8aac64 (patch) | |
| tree | a11ddf92e6ec419a1947696e864c89140608d717 | |
| parent | 274b5da562ae5215dd87c203e1e5f8e596af4c60 (diff) | |
CSIT-452: Switch Qemu binary to Ubuntu default
- Switch Qemu binary to default path and remove building qemu in performance jobs
Change-Id: I5e8bb510beb672d034699192a7c454c56f2d2581
Signed-off-by: pmikus <pmikus@cisco.com>
4 files changed, 1 insertions, 4 deletions
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index aa149da185..76f86063e2 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -27,7 +27,7 @@ from resources.libraries.python.topology import NodeType class QemuUtils(object): """QEMU utilities.""" - __QEMU_BIN = '/opt/qemu/bin/qemu-system-x86_64' + __QEMU_BIN = '/usr/bin/qemu-system-x86_64' # QEMU Machine Protocol socket __QMP_SOCK = '/tmp/qmp.sock' # QEMU Guest Agent socket diff --git a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot index 45a66ef138..7f2b45ecab 100644 --- a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot @@ -19,7 +19,6 @@ | Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 | ... | AND | Kill QEMU on all DUTs -| ... | AND | Build QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords diff --git a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot index dc8361324e..828139fd07 100644 --- a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot @@ -19,7 +19,6 @@ | Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 | ... | AND | Kill QEMU on all DUTs -| ... | AND | Build QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords diff --git a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot index 49df14e471..b8a5abf549 100644 --- a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot @@ -19,7 +19,6 @@ | Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 | ... | AND | Kill QEMU on all DUTs -| ... | AND | Build QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords |