Commit 0081cfea authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Put sources installation into a separate function 



This allows other entities to source pkgdep/git and safely use other
available routines.

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


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>
parent fc7d5d4e

test/common/config/pkgdep/git

+50 −47
Original line number Diff line number Diff line
@@ -471,38 +471,7 @@ function install_ice() { 
	)

}



GIT_VERSION=2.25.1

IRDMA_VERSION=1.2.21

ICE_VERSION=1.2.1

: ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git}

export GIT_REPO_SPDK

: ${GIT_REPO_DPDK=https://github.com/spdk/dpdk.git}

export GIT_REPO_DPDK

: ${GIT_REPO_ROCKSDB=https://review.spdk.io/spdk/rocksdb}

export GIT_REPO_ROCKSDB

: ${GIT_REPO_FIO=https://github.com/axboe/fio.git}

export GIT_REPO_FIO

: ${GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git}

export GIT_REPO_FLAMEGRAPH

: ${GIT_REPO_QEMU=https://github.com/spdk/qemu}

export GIT_REPO_QEMU

: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}

export GIT_REPO_LIBISCSI

: ${GIT_REPO_INTEL_IPSEC_MB=https://github.com/spdk/intel-ipsec-mb.git}

export GIT_REPO_INTEL_IPSEC_MB

: ${DRIVER_LOCATION_QAT=https://01.org/sites/default/files/downloads//qat1.7.l.4.12.0-00011.tar.gz}

export DRIVER_LOCATION_QAT

: ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz}

export GIT_REPO_GIT

: ${GIT_REPO_DPDK_KMODS=http://dpdk.org/git/dpdk-kmods}

export GIT_REPO_DPDK_KMODS

: ${IRDMA_DRIVER=https://downloadmirror.intel.com/29751/eng/irdma-$IRDMA_VERSION.tgz}

export IRDMA_DRIVER

: ${ICE_DRIVER=https://downloadmirror.intel.com/29746/eng/ice-$ICE_VERSION.tar.gz}

export ICE_DRIVER

GIT_REPOS=${GIT_REPOS:-$HOME}



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

function install_sources() {

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

		# install proper version of the git first

		install_git
@@ -550,3 +519,37 @@ if [[ $INSTALL_REFSPDK == true ]]; then 
		install_refspdk latest

		install_refspdk LTS

	fi

}



GIT_VERSION=2.25.1

IRDMA_VERSION=1.2.21

ICE_VERSION=1.2.1

: ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git}

export GIT_REPO_SPDK

: ${GIT_REPO_DPDK=https://github.com/spdk/dpdk.git}

export GIT_REPO_DPDK

: ${GIT_REPO_ROCKSDB=https://review.spdk.io/spdk/rocksdb}

export GIT_REPO_ROCKSDB

: ${GIT_REPO_FIO=https://github.com/axboe/fio.git}

export GIT_REPO_FIO

: ${GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git}

export GIT_REPO_FLAMEGRAPH

: ${GIT_REPO_QEMU=https://github.com/spdk/qemu}

export GIT_REPO_QEMU

: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}

export GIT_REPO_LIBISCSI

: ${GIT_REPO_INTEL_IPSEC_MB=https://github.com/spdk/intel-ipsec-mb.git}

export GIT_REPO_INTEL_IPSEC_MB

: ${DRIVER_LOCATION_QAT=https://01.org/sites/default/files/downloads//qat1.7.l.4.12.0-00011.tar.gz}

export DRIVER_LOCATION_QAT

: ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz}

export GIT_REPO_GIT

: ${GIT_REPO_DPDK_KMODS=http://dpdk.org/git/dpdk-kmods}

export GIT_REPO_DPDK_KMODS

: ${IRDMA_DRIVER=https://downloadmirror.intel.com/29751/eng/irdma-$IRDMA_VERSION.tgz}

export IRDMA_DRIVER

: ${ICE_DRIVER=https://downloadmirror.intel.com/29746/eng/ice-$ICE_VERSION.tar.gz}

export ICE_DRIVER

GIT_REPOS=${GIT_REPOS:-$HOME}



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

test/common/config/vm_setup.sh

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ if $INSTALL; then 
fi



source "$vmsetupdir/pkgdep/git"

install_sources



# create autorun-spdk.conf in home folder. This is sourced by the autotest_common.sh file.

# By setting any one of the values below to 0, you can skip that specific test. If you are