From c93113bdd2ca335629b04a071aff0f82baa8cd34 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 28 Dec 2021 18:09:02 +0100 Subject: [PATCH] autopackage: Remove .rpms between the tests f6ab6c09e3 changed the glob pattern for building the rpms[] list in the way that it now includes all the *.rpms. This breaks the test against the native dpdk since it picks up the .rpms created by the previous tests - this causes rpm -i to fail since packages with conflicting contents are being installed. To mitigate, purge all rpm packages after each test is completed. Signed-off-by: Michal Berger Change-Id: I9516956f241936b2be400740ce6758594092ebc9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10899 Community-CI: Broadcom CI Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- autopackage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autopackage.sh b/autopackage.sh index fffba17b5..4d8c9249b 100755 --- a/autopackage.sh +++ b/autopackage.sh @@ -24,10 +24,11 @@ function build_rpms() ( rpms=("$builddir/rpm/x86_64/"*.rpm) sudo rpm -i "${rpms[@]}" - rpms=("${rpms[@]##*/}") rpms=("${rpms[@]%.rpm}") # Check if we can find one of the apps in the PATH now and verify if it doesn't miss # any libs. LIST_LIBS=yes "$rootdir/rpmbuild/rpm-deps.sh" "${SPDK_APP[@]##*/}" + rm "${rpms[@]}" + rpms=("${rpms[@]##*/}") rpms=("${rpms[@]%.rpm}") sudo rpm -e "${rpms[@]}" }