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>

diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index aa149da..76f8606 100644 (file)
--- 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 45a66ef..7f2b45e 100644 (file)
--- 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 dc83613..828139f 100644 (file)
--- 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 49df14e..b8a5abf 100644 (file)
--- 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