ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/packaging: Don't install DPDK RPMs from the remote by default

Browse Source 
This may cause unwanted intermittent issues depending on how long
dnf syncs its repos - on occasion it takes too much time leading
to job timeouts under the CI. As an alternative, look under a specific
path to see if dpdk{,-devel}.rpm are already in place and install
them locally - VM images on the CI side will be already provisioned
with all needed dependencies.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Ic924574889b52d521db4799cbb12b4c238a2fe3a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16304
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
This commit is contained in:
Michal Berger 2023-01-16 13:20:06 +01:00 committed by Konrad Sztyber
parent eda537344a
commit 184325fd2b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/packaging/rpm/rpm.sh
View File

@ -7,6 +7,7 @@
testdir=$(readlink -f "$(dirname "$0")") testdir=$(readlink -f "$(dirname "$0")")
rootdir=$(readlink -f "$testdir/../../../") rootdir=$(readlink -f "$testdir/../../../")
source "$rootdir/test/common/autotest_common.sh" source "$rootdir/test/common/autotest_common.sh"
shopt -s extglob
builddir=$SPDK_TEST_STORAGE/test-rpm builddir=$SPDK_TEST_STORAGE/test-rpm
@ -47,9 +48,16 @@ build_shared_rpm() {
} }
build_rpm_with_rpmed_dpdk() { build_rpm_with_rpmed_dpdk() {
local es=0 local es=0 dpdk_rpms=()
sudo dnf install -y dpdk-devel dpdk_rpms=(/var/spdk/dependencies/autotest/dpdk/dpdk?(-devel).rpm)
if ((${#dpdk_rpms[@]} == 2)); then # dpdk, dpdk-devel
echo "INFO: Installing DPDK from local package: $(rpm -q --queryformat="%{VERSION}" "${dpdk_rpms[0]}")" >&2
sudo rpm -i "${dpdk_rpms[@]}"
else
echo "WARNING: No local packages found, trying to install DPDK from the remote" >&2
sudo dnf install -y dpdk-devel
fi
build_rpm --with-shared --with-dpdk || es=$? build_rpm --with-shared --with-dpdk || es=$?
if ((es == 11)); then if ((es == 11)); then