From f6ab6c09e30beda893a842c2bfdaec87858b19d8 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Wed, 16 Jun 2021 10:43:48 +0200
Subject: [PATCH] autopackage: Test RPM build against RPMed DPDK

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: If7c2d2b4b09bb05ee42f78e01ef4c68a0810d2cb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8388
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: <tomasz.rochumski@intel.com>
---
 autopackage.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/autopackage.sh b/autopackage.sh
index 193982f7a1..9f4c008521 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -21,7 +21,7 @@ function build_rpms() (
 	unset -v LD_LIBRARY_PATH
 
 	install_uninstall_rpms() {
-		rpms=("$builddir/rpm/x86_64/"spdk{,-devel,{,-dpdk}-libs}-$version-1.x86_64.rpm)
+		rpms=("$builddir/rpm/x86_64/"*.rpm)
 
 		sudo rpm -i "${rpms[@]}"
 		rpms=("${rpms[@]##*/}") rpms=("${rpms[@]%.rpm}")
@@ -36,9 +36,16 @@ function build_rpms() (
 		install_uninstall_rpms
 	}
 
+	build_rpm_with_rpmed_dpdk() {
+		sudo dnf install -y dpdk-devel
+		build_rpm --with-shared --with-dpdk
+	}
+
 	version="test_shared"
 	builddir=$SPDK_TEST_STORAGE/test-rpm
+
 	run_test "build_shared_rpm" build_rpm --with-shared
+	run_test "build_shared_rpm_with_rpmed_dpdk" build_rpm_with_rpmed_dpdk
 
 	if [[ -n $SPDK_TEST_NATIVE_DPDK ]]; then
 		version="test_shared_native_dpdk"