From 095b162010491a4759e05ca46f0e5a47e8ace141 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 22 Mar 2018 13:21:05 +0100 Subject: 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 --- resources/libraries/bash/config/config | 7 +++++-- resources/libraries/bash/config/defaults | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'resources/libraries/bash/config') diff --git a/resources/libraries/bash/config/config b/resources/libraries/bash/config/config index 2b71edcc49..42f23bdaf8 100644 --- a/resources/libraries/bash/config/config +++ b/resources/libraries/bash/config/config @@ -1,5 +1,8 @@ -QEMU_INSTALL_DIR=/opt +QEMU_INSTALL_DIR=/opt/qemu-2.5.0 QEMU_INSTALL_VERSION=qemu-2.5.0 +QEMU_PATCH=false +QEMU_FORCE_INSTALL=false +QEMU_TARGET_LIST=x86_64-softmmu DPDK_INSTALL_DIR=/opt -DPDK_INSTALL_VERSION=dpdk-17.11 \ No newline at end of file +DPDK_INSTALL_VERSION=dpdk-17.11 diff --git a/resources/libraries/bash/config/defaults b/resources/libraries/bash/config/defaults index 1547452982..a70add12b1 100644 --- a/resources/libraries/bash/config/defaults +++ b/resources/libraries/bash/config/defaults @@ -2,11 +2,14 @@ typeset -A cfg cfg=( # set default values in config array - [QEMU_INSTALL_DIR]="/opt" + [QEMU_INSTALL_DIR]="/opt/qemu-2.5.0" [QEMU_INSTALL_VERSION]="qemu-2.5.0" + [QEMU_PATCH]=false + [QEMU_FORCE_INSTALL]=false + [QEMU_TARGET_LIST]=x86_64-softmmu [DPDK_INSTALL_DIR]=/opt [DPDK_INSTALL_VERSION]=dpdk-17.11 [K8S_CALICO]="${SCRIPT_DIR}/../../templates/kubernetes/calico_v2.6.3.yaml" [K8S_CONTIV_VPP]="https://raw.githubusercontent.com/contiv/vpp/master/k8s/contiv-vpp.yaml" [K8S_CSIT]="${SCRIPT_DIR}/../../templates/kubernetes/csit.yaml" -) \ No newline at end of file +) -- cgit 1.2.3-korg