Commit 48a6e736 authored by Ben Walker's avatar Ben Walker
Browse files

test: Install packaged QEMU in vm_setup.sh 



We only need the fork for OCSSD tests. And eventually we won't
even need that.

Change-Id: I0f52c44f504435a3bab2f478664a88ba6acfe464
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459960


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 123ccd10

test/common/config/vm_setup.sh

+12 −1
Original line number Diff line number Diff line
@@ -186,7 +186,18 @@ function install_flamegraph() 
function install_qemu()

{

    if echo $CONF | grep -q qemu; then

        # Qemu is used in the vhost tests.

        # Two versions of QEMU are used in the tests.

        # Stock QEMU is used for vhost. A special fork

        # is used to test OCSSDs. Install both.



        # Packaged QEMU

        if [ "$PACKAGEMNG" = "dnf" ]; then

                sudo dnf install -y qemu-system-x86 qemu-img

        elif [ "$PACKAGEMNG" = "apt-get" ]; then

                sudo apt-get install -y qemu-system-x86 qemu-img

        fi



        # Forked QEMU

        SPDK_QEMU_BRANCH=spdk-3.0.0

        mkdir -p qemu

        if [ ! -d "qemu/$SPDK_QEMU_BRANCH" ]; then