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

pkgdep/git: Don't force bpftrace installation 



In case user sets --test-conf="" the pkgdep/git still forces
bpftrace installation under fedora35 and newer. Avoid this to
make sure user has a clear view on what's being installed (and
what not) in respect to defined cmdline arguments.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 7de190ae

test/common/config/pkgdep/git

+1 −4
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ function install_sources() { 
			install_igb_uio

			install_ice

			install_lcov

			install_bpftrace

		)

		install_extra_pkgs

	fi
@@ -586,10 +587,6 @@ function install_sources() { 
		fi

	done



	if [[ $INSTALL_BPFTRACE == true ]] || [[ $ID == fedora ]] && (( VERSION_ID >= 35 )); then

		install_bpftrace

	fi



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

		# Serialize builds as refspdk depends on spdk

		[[ $INSTALL_SPDK != true ]] && install_spdk

test/common/config/vm_setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ function usage() { 
	echo "  -h --help"

	echo "  -u --upgrade Run $package_manager upgrade"

	echo "  -i --install-deps Install $package_manager based dependencies"

	echo "  -t --test-conf List of test configurations to enable (${CONF},irdma,lcov)"

	echo "  -t --test-conf List of test configurations to enable (${CONF},irdma,lcov,bpftrace)"

	echo "  -c --conf-path Path to configuration file"

	echo "  -d --dir-git Path to where git sources should be saved"

	echo "  -s --disable-tsocks Disable use of tsocks"