From b85b7e2b930f1ec30af7d53dddab9183cd8e90d7 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 11 Sep 2020 21:55:21 +0200 Subject: [PATCH] pkgdep/git: Don't indicate error if vagrant installation is not supported This would unecessarily print out usage() and call exit which wouldn't be respected since all sources (except {,ref}spdk) are installed in the background anyway. Also, since std{out,err} may be bloated with bunch of messages comming from different sources, explicitly mention Vagrant name in the echo. Change-Id: I737f5cf08d6ae3d2d494add143d1dfaf89beeead Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4189 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 5e072d295..398a80ea4 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -270,7 +270,8 @@ function install_vagrant() { local vagrant_plugins=(vagrant-libvirt vagrant-sshfs vagrant-cachier vagrant-proxyconf) if [[ $OSID != ubuntu ]]; then - error "Currently only ubuntu is supported" + echo "Currently, Vagrant installation is supported only on ubuntu" + return 0 fi # Install vagrant and it's plugins dependencies