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

test/packaging: Adjust vs-dpdk test 



Since 6747380f it's now user's responsibility to package DPDK into
a separate RPM - this broke build_shared_native_dpdk_rpm() test under
vs-dpdk jobs.

This test now needs to bundle --with-dpdk=* into a separate RPM alone
so do just that.

Get rid of Epoch handling and update minimal supported DPDK to 22.11.

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


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 89d955ae

rpmbuild/rpm.sh

+2 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ get_version() { 


build_macros() {

	local -g macros=()

	local dir _dir

	local dir _dir dpdk_req



	macros+=(-D "configure ${configure:-"%{nil}"}")

	macros+=(-D "make $make")
@@ -96,13 +96,8 @@ build_macros() { 
	if get_config with-dpdk; then

		# spdk is requested to build against installed dpdk (i.e. provided by the dist).

		# Don't build dpdk rpm rather define proper requirements for the spdk.

		dpdk_req="dpdk-devel >= 22.11"

		macros+=(-D "dpdk 0")

		# This maps how Epoch is used inside dpdk packages across different distros. It's

		# mainly relevant when comparing version of required packages. Default maps to 0.

		local -A dpdk_rpm_epoch["fedora"]=2

		local dpdk_version_min=${dpdk_rpm_epoch["$ID"]:-0}:20.11

		local dpdk_req="dpdk-devel >= $dpdk_version_min"



		requirements=${requirements:+$requirements, }"$dpdk_req"

		build_requirements=${build_requirements:+$build_requirements, }"$dpdk_req"

	else

test/packaging/rpm/rpm.sh

+84 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ unset -v LD_LIBRARY_PATH 
# Export some common settings

BUILDDIR=$builddir

DEPS=no

arch=$(uname -m)



export MAKEFLAGS BUILDDIR DEPS
@@ -23,12 +24,80 @@ cleanup() { 
	rm -rf "$builddir"

	rm -rf "$(rpm --eval "%{_topdir}")"

	rm -rf /tmp/spdk-test_gen_spec

	sudo rpm -e $(rpm -qa | grep -E 'spdk|dpdk') || true

}



gen_dpdk_spec() (

	cat <<- DPDK_SPEC

		%define source_date_epoch_from_changelog %{nil}



		Name:           dpdk-devel

		Version:        $1

		Release:        $2

		Summary:        TESTME

		Source:         dpdk.tar.gz

		License:        TESTME



		%description

		TESTME



		%files

		/usr/local/lib/*

	DPDK_SPEC

)



build_dpdk_rpm() (

	local dpdkdir=$1 version=${2%.*} spec=$builddir/dpdk.spec

	local dpdkbuildroot=$builddir/dpdk/usr/local/lib dep

	local srcdir=$builddir/source

	local rpmdir=$builddir/rpms

	local release=1



	mkdir -p "$srcdir" "$rpmdir"



	# Dummy package to satisfy rpmbuild

	: > "$srcdir/dpdk.tar.gz"



	gen_dpdk_spec "$version" "$release" > "$spec"



	# Prepare our buildroot to pack just the libraries without actually building

	# anything. To do so, we need to copy what we need into a separate location

	# to not fiddle with rpmbuild's view on what should be packed and what

	# shouldn't.

	mkdir -p "$dpdkbuildroot"



	[[ -e $dpdkdir/lib ]]

	cp -a "$dpdkdir/lib/"* "$dpdkbuildroot/"



	# Check isa-l and IPSec dependencies - dedicated to the vs-dpdk test

	for dep in isa-l/build/lib intel-ipsec-mb; do

		[[ -e $dpdkdir/../$dep ]] || continue

		find "$dpdkdir/../$dep" \

			-name '*.so*' \

			-exec cp -at "$dpdkbuildroot/" {} +

	done



	rpmbuild \

		--buildroot="$builddir/dpdk" \

		-D "_rpmdir $rpmdir" \

		-D "_sourcedir $srcdir" \

		--noclean \

		--nodebuginfo \

		-ba "$spec"



	# Put our dummy package in place

	sudo rpm -i "$rpmdir/$arch/dpdk-devel-$version-$release.$arch.rpm"



	# Run actual test

	MV_RUNPATH=$dpdkdir build_rpm --with-shared --with-dpdk="$dpdkdir"



	sudo rpm -e dpdk-devel

)



install_uninstall_rpms() {

	local rpms



	rpms=("${1:-$builddir/rpm/}/$(uname -m)/"*.rpm)

	rpms=("${1:-$builddir/rpm/}/$arch/"*.rpm)



	# Clean repo first to make sure linker won't follow $SPDK_APP's RUNPATH

	make -C "$rootdir" clean $MAKEFLAGS
@@ -47,7 +116,14 @@ build_rpm() { 
	GEN_SPEC=yes "$rootdir/rpmbuild/rpm.sh" "$@"

	# Actual build

	"$rootdir/rpmbuild/rpm.sh" "$@" || return $?

	# FIXME: Remove the MV_RUNPATH HACK when the patchelf is available. See: 9cb9f24152f

	if [[ -n $MV_RUNPATH ]]; then

		mv "$MV_RUNPATH"{,.hidden}

	fi

	install_uninstall_rpms

	if [[ -n $MV_RUNPATH ]]; then

		mv "$MV_RUNPATH"{.hidden,}

	fi

}



build_shared_rpm() {
@@ -70,6 +146,9 @@ build_rpm_with_rpmed_dpdk() { 
	if ((es == 11)); then

		echo "ERROR: Failed to resolve required build dependencies. Please review the build log." >&2

	fi



	sudo rpm -e dpdk{,-devel} || true



	return "$es"

}
@@ -105,7 +184,10 @@ build_rpm_from_gen_spec() { 
build_shared_native_dpdk_rpm() {

	[[ -e /tmp/spdk-ld-path ]] # autobuild dependency

	source /tmp/spdk-ld-path

	build_rpm --with-shared --with-dpdk="$SPDK_RUN_EXTERNAL_DPDK"



	build_dpdk_rpm \

		"$SPDK_RUN_EXTERNAL_DPDK" \

		"$(< $SPDK_RUN_EXTERNAL_DPDK/../VERSION)"

}



trap 'cleanup' EXIT
@@ -120,5 +202,3 @@ fi 
if [[ -n $SPDK_TEST_NATIVE_DPDK ]]; then

	run_test "build_shared_native_dpdk_rpm" build_shared_native_dpdk_rpm

fi
 


rm -rf "$builddir"