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

pkgdep/git: Add support for vanilla qemu (5.1.0)

Browse Source 
This is done as part of a request to run tests on PMR-capable VMs
in the CI pool.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Icf64bf07cd81945e519b0d212ca126d79c3fecbc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7020
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-03-23 21:52:52 +01:00 committed by Jim Harris
parent 0cb256c03d
commit 18ee5d7bff
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/common/config/pkgdep/git
View File

@ -295,17 +295,23 @@ function _install_qemu() {
} }
function install_qemu() { function install_qemu() {
# Three versions of QEMU are used in the tests. # Four versions of QEMU are used in the tests, three are installed
# Stock QEMU is used for vhost. # directly from the source. Each QEMU is dedicated for different
# A special fork is used to test OCSSDs. # use-cases:
# Third is for libvfio-user tests. # - Packed QEMU: version provided by given distro. Used to boot VMs
# Install all. # from within vhost tests.
# - SPDK QEMU: A special fork to test OCSSDs. Most jobs on CI use
# this version for booting the VMs.
# - vfio-user QEMU: A special fork to test libvfio-user components.
# - Vanilla QEMU: Used for the upstream PMR support.
# Forked QEMUs # Forked QEMUs
SPDK_QEMU_BRANCH=spdk-5.0.0 SPDK_QEMU_BRANCH=spdk-5.0.0
VFIO_QEMU_BRANCH=vfio-user-v0.6 VFIO_QEMU_BRANCH=vfio-user-v0.6
_install_qemu $GIT_REPO_QEMU $SPDK_QEMU_BRANCH VANILLA_QEMU_BRANCH=v5.1.0
_install_qemu $GIT_REPO_QEMU_SPDK $SPDK_QEMU_BRANCH
_install_qemu $GIT_REPO_QEMU_VFIO $VFIO_QEMU_BRANCH _install_qemu $GIT_REPO_QEMU_VFIO $VFIO_QEMU_BRANCH
_install_qemu "$GIT_REPO_QEMU" "$VANILLA_QEMU_BRANCH"
} }
function install_nvmecli() { function install_nvmecli() {
@ -556,8 +562,10 @@ export GIT_REPO_ROCKSDB
export GIT_REPO_FIO export GIT_REPO_FIO
: ${GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git} : ${GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git}
export GIT_REPO_FLAMEGRAPH export GIT_REPO_FLAMEGRAPH
: ${GIT_REPO_QEMU=https://github.com/spdk/qemu} : ${GIT_REPO_QEMU=https://github.com/qemu/qemu}
export GIT_REPO_QEMU export GIT_REPO_QEMU
: ${GIT_REPO_QEMU_SPDK=https://github.com/spdk/qemu}
export GIT_REPO_QEMU_SPDK
: ${GIT_REPO_QEMU_VFIO=https://github.com/tmakatos/qemu} : ${GIT_REPO_QEMU_VFIO=https://github.com/tmakatos/qemu}
export GIT_REPO_QEMU_VFIO export GIT_REPO_QEMU_VFIO
: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi} : ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}