ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Install packaged QEMU in vm_setup.sh

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

Change-Id: I0f52c44f504435a3bab2f478664a88ba6acfe464
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459960
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Ben Walker 2019-07-01 05:38:31 -07:00
parent 123ccd10a9
commit 48a6e736fd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/common/config/vm_setup.sh
View File

@ -186,7 +186,18 @@ function install_flamegraph()
function install_qemu() function install_qemu()
{ {
if echo $CONF | grep -q qemu; then 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 SPDK_QEMU_BRANCH=spdk-3.0.0
mkdir -p qemu mkdir -p qemu
if [ ! -d "qemu/$SPDK_QEMU_BRANCH" ]; then if [ ! -d "qemu/$SPDK_QEMU_BRANCH" ]; then