From db31afaaefe17c7ac204e8cab00b41098c3470dd Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 11 Sep 2020 22:02:13 +0200 Subject: [PATCH] pkgdep/git: Rearrange order in which install_refspdk() is called Since refspdk has its source built, we should give it a chance to avoid any potential issues with missing dependencies. To do that, let's run it at the very end after all other sources were already put in place (this is mainly relevant to FreeBSD where cmdline for ./configure is hardcoded). Change-Id: Ic07129c7b879eff7fddd734c9c4a6787df3da7ec Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4190 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 398a80ea4..befdaa2c8 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -336,7 +336,6 @@ IFS="," read -ra conf_env <<< "$CONF" for conf in "${conf_env[@]}"; do export "INSTALL_${conf^^}=true" done -sources=(install_refspdk) if [[ $OSID == freebsd ]]; then jobs=$(($(sysctl -n hw.ncpu) * 2)) @@ -354,18 +353,11 @@ else fi sources+=(install_fio) sources+=(install_vagrant) +sources+=(install_spdk) sudo mkdir -p /usr/{,local}/src sudo mkdir -p "$GIT_REPOS" -if [[ $INSTALL_REFSPDK == true ]]; then - # Serialize builds as refspdk depends on spdk - install_spdk - install_refspdk -else - sources+=(install_spdk) -fi - for source in "${sources[@]}"; do source_conf=${source^^} if [[ ${!source_conf} == true ]]; then @@ -373,3 +365,9 @@ for source in "${sources[@]}"; do fi done wait + +if [[ $INSTALL_REFSPDK == true ]]; then + # Serialize builds as refspdk depends on spdk + [[ $INSTALL_SPDK != true ]] && install_spdk + install_refspdk +fi