d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts/pkgdep: move markdownlint install to pkgdep scripts

Browse Source 
Signed-off-by: Maciej 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: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Monica Kenguva <monica.kenguva@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
This commit is contained in:
Maciej Wawryk 2021-08-06 12:09:31 +02:00 committed by Tomasz Zawadzki
parent 2f5c602574
commit 83440f1ded
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/pkgdep/common.sh
View File

@ -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

22
test/common/config/pkgdep/git
View File

@ -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%%.*}

2
test/common/config/vm_setup.sh
View File

@ -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() { :; }