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

test/vm_setup: Add clearlinux package manager 



Also remove unnecessary jq from pkgdep

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 3c8451e6

scripts/pkgdep/clear-linux-os.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Install main dependencies

swupd bundle-add -y c-basic make dev-utils openssl devpkg-libiscsi \

	devpkg-ncurses python3-basic python-extras devpkg-open-iscsi \

	jq storage-utils

	storage-utils

# Additional dependencies for ISA-L used in compression

swupd bundle-add -y dev-utils-dev

# Additional dependencies for DPDK

test/common/config/pkgdep/swupd

0 → 100644
+21 −0
Original line number Diff line number Diff line 
package_manager=swupd



upgrade() {

	sudo "$package_manager" update -y

}



install() {

	(($#)) || return 0



	sudo "$package_manager" bundle-add -y "$@"

}



packages=(

	jq

)



pre_install() {

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

		install tsocks || echo "Installation of the tsocks package failed, proxy may not be available"

	fi

}

test/common/config/vm_setup.sh

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ elif hash pacman &> /dev/null; then 
	source "$vmsetupdir/pkgdep/pacman"

elif hash pkg &> /dev/null; then

	source "$vmsetupdir/pkgdep/pkg"

elif hash swupd &> /dev/null; then

	source "$vmsetupdir/pkgdep/swupd"

else

	package_manager="undefined"

fi