Commit 83440f1d authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Tomasz Zawadzki
Browse files

scripts/pkgdep: move markdownlint install to pkgdep scripts 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: If2cc3cf797602f90b26407d35f64840bb2d2697c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9108


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
parent 2f5c6025

scripts/pkgdep/common.sh

+21 −0
Original line number Diff line number Diff line
@@ -79,9 +79,30 @@ install_spdk_bash_completion() { 
	fi

}



install_markdownlint() {

	local git_repo_mdl="https://github.com/markdownlint/markdownlint.git"

	local mdl_version="v0.11.0"

	if [ ! -d /usr/src/markdownlint ]; then

		sudo -E git clone --branch "$mdl_version" "$git_repo_mdl" "/usr/src/markdownlint"

		(

			cd /usr/src/markdownlint

			if ! hash rake; then

				sudo -E gem install rake

			fi

			if ! hash bundler; then

				sudo -E gem install bundler

			fi

			sudo -E rake install

		)

	else

		echo "Markdown lint tool already in /usr/src/markdownlint. Not installing"

	fi

}



if [[ $INSTALL_DEV_TOOLS == true ]]; then

	install_shfmt

	install_spdk_bash_completion

	install_markdownlint

fi



if [[ $INSTALL_LIBURING == true ]]; then

test/common/config/pkgdep/git

+0 −22
Original line number Diff line number Diff line
@@ -190,25 +190,6 @@ function install_rocksdb() { 
	fi

}



function install_markdownlint() {

	local mdl_version="v0.11.0"

	if [ ! -d /usr/src/markdownlint ]; then

		sudo -E git clone --branch "$mdl_version" "${GIT_REPO_MDL}" "/usr/src/markdownlint"

		(

			cd /usr/src/markdownlint

			if ! hash rake; then

				sudo -E gem install rake

			fi

			if ! hash bundler; then

				sudo -E gem install bundler

			fi

			sudo -E rake install

		)

	else

		echo "Markdown lint tool already in /usr/src/markdownlint. Not installing"

	fi

}



function install_fio() {

	# This version of fio is installed in /usr/src/fio to enable

	# building the spdk fio plugin.
@@ -531,7 +512,6 @@ function install_sources() { 
			install_qemu

			install_igb_uio

			install_ice

			install_markdownlint

		)

		install_extra_pkgs

	fi
@@ -594,8 +574,6 @@ export GIT_REPO_DPDK_KMODS 
export IRDMA_DRIVER

: ${ICE_DRIVER="https://sourceforge.net/projects/e1000/files/ice stable/$ICE_VERSION/ice-$ICE_VERSION.tar.gz"}

export ICE_DRIVER

: ${GIT_REPO_MDL="https://github.com/markdownlint/markdownlint.git"}

export GIT_REPO_MDL

GIT_REPOS=${GIT_REPOS:-$HOME}



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

test/common/config/vm_setup.sh

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


UPGRADE=false

INSTALL=false

CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant,igb_uio,ice,markdownlint"

CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant,igb_uio,ice"

package_manager=



function pre_install() { :; }