Commit cc619301 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/vm_setup: move git commands after package installation 



Couple of reasons here:
- "install" should run first, as it runs pkgdep.sh which
  actually installs git for all distros.
- Because of that we can remove ArchLinux and Centos7
  git installation with package manager - this is already
  covered by pkgdep.sh.
- install_git routine relies on wget and autoconf, which
  have to be installed first.
- install_git routine (which actually upgrades git on
  Centos7) makes it possible to use "git -C". Default
  1.85 git version on that system does not support that.

Change-Id: I1422f8c2a1c49eb38f4253909a152a7bc99b173f
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1995


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 4b7f11ec

test/common/config/vm_setup.sh

+15 −23
Original line number Diff line number Diff line
@@ -432,29 +432,6 @@ if $UPGRADE; then 
    fi

fi



if $INSTALL; then

    if [ $PACKAGEMNG == 'pacman' ]; then

        sudo $PACKAGEMNG -Sy --needed --noconfirm git

    else

        if [ "${OSID} ${OSVERSION}" == 'centos 7' ]; then

            install_git

        else

            sudo $PACKAGEMNG install -y git

        fi

    fi

fi



mkdir -p spdk_repo/output || echo "Can not create spdk_repo/output directory."



if [ -d spdk_repo/spdk ]; then

    echo "spdk source already present, not cloning"

else

    git -C spdk_repo clone "${GIT_REPO_SPDK}"

fi

git -C spdk_repo/spdk config submodule.dpdk.url "${GIT_REPO_DPDK}"

git -C spdk_repo/spdk config submodule.intel-ipsec-mb.url "${GIT_REPO_INTEL_IPSEC_MB}"

git -C spdk_repo/spdk submodule update --init --recursive



if $INSTALL; then

    if [ "${OSID} ${OSVERSION}" == 'centos 8' ]; then

        #During install using vm_setup.sh there is error with AppStream, to fix it we need to refresh yum
@@ -708,7 +685,22 @@ if $INSTALL; then 
    else

        echo "Package manager is undefined, skipping INSTALL step"

    fi



    if [ "${OSID} ${OSVERSION}" == 'centos 7' ]; then

            install_git

    fi

fi



mkdir -p spdk_repo/output || echo "Can not create spdk_repo/output directory."



if [ -d spdk_repo/spdk ]; then

    echo "spdk source already present, not cloning"

else

    git -C spdk_repo clone "${GIT_REPO_SPDK}"

fi

git -C spdk_repo/spdk config submodule.dpdk.url "${GIT_REPO_DPDK}"

git -C spdk_repo/spdk config submodule.intel-ipsec-mb.url "${GIT_REPO_INTEL_IPSEC_MB}"

git -C spdk_repo/spdk submodule update --init --recursive



sudo mkdir -p /usr/src