Commit 0ccf1fc3 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

vm_setup: Move gcc version check to git sources 



In case vm_setup.sh is called on a bare system (e.g. cloud image), it
will instantly fail since gcc won't be on board, forcing user to either
install it by itself or by running our pkgdep.sh first.

Moving this check to pkgdep/git will mitigate similar issues since
before it's sourced, an $INSTALL portion of the script will have a
chance to run pkgdep.sh on its own (this still depends on user running
vm_setup.sh with -i arg, but still ;)).

Change-Id: I309ca42e8ea15fd14e416fc85fa0e244de2d8262
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2785


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 7d2b98a7

test/common/config/pkgdep/git

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ export DRIVER_LOCATION_QAT 
export GIT_REPO_GIT

GIT_REPOS=${GIT_REPOS:-$HOME}



gcc_version=$(gcc -dumpversion) gcc_version=${gcc_version%%.*}

if [[ $ID == centos ]] && (( VERSION_ID == 7 )); then

	# install proper version of the git first

	install_git

test/common/config/vm_setup.sh

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*}) 
UPGRADE=false

INSTALL=false

CONF="rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat,spdk,refspdk"

gcc_version=$(gcc -dumpversion) gcc_version=${gcc_version%%.*}



if [[ -e /etc/os-release ]]; then

	source /etc/os-release