From 54e22547effd05e0c78353adbbbe9ca9b792fb94 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Mon, 22 Nov 2021 22:10:02 +0100 Subject: [PATCH] autobuild: Stop patching DPDK versions not tested under CI Currently CI tests 21.08, 20.11 and the main branch. Maintaining patches for other versions feels extraneous and adds only extra work under autobuild. Signed-off-by: Michal Berger Change-Id: I2dfac60fe3745b09fbe7159b170739680c94a8c5 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10359 Community-CI: Broadcom CI Reviewed-by: Karol Latecki Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- autobuild.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 90aa855e3..e5bf00fa0 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -158,16 +158,10 @@ function build_native_dpdk() { if [ "$(uname -s)" = "Linux" ]; then # Fix for freeing device if not kernel driver configured. # TODO: Remove once this is merged in upstream DPDK - if grep "20.08.0" $external_dpdk_base_dir/VERSION; then - wget https://github.com/spdk/dpdk/commit/64f1ced13f974e8b3d46b87c361a09eca68126f9.patch -O dpdk-pci.patch - wget https://github.com/spdk/dpdk/commit/c2c273d5c8fbf673623b427f8f4ab5af5ddf0e08.patch -O dpdk-qat.patch - elif grep "20.11\|21.02" $external_dpdk_base_dir/VERSION; then + if [[ $dpdk_ver == 20.11* ]]; then wget https://github.com/karlatec/dpdk/commit/3219c0cfc38803aec10c809dde16e013b370bda9.patch -O dpdk-pci.patch wget https://github.com/karlatec/dpdk/commit/adf8f7638de29bc4bf9ba3faf12bbdae73acda0c.patch -O dpdk-qat.patch - elif grep "21.05" $external_dpdk_base_dir/VERSION; then - wget https://github.com/karlatec/dpdk/commit/f95e331be3a1f856b816948990dd2afc67ea4020.patch -O dpdk-pci.patch - wget https://github.com/karlatec/dpdk/commit/6fd2fa906ffdcee04e6ce5da40e61cb841be9827.patch -O dpdk-qat.patch - else + elif [[ $dpdk_ver == 21.08* ]]; then wget https://github.com/karlatec/dpdk/commit/6fd2fa906ffdcee04e6ce5da40e61cb841be9827.patch -O dpdk-qat.patch fi git config --local user.name "spdk"