diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 78671c3..8fea091 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -8,6 +8,19 @@ index f7e6215dda..4424f9eb97 100755 pip3 install --disable-pip-version-check --user pyelftools -pip3 install --user 'meson==0.53.2' +pip3 install --user 'meson>=1.4,<1.5' +diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh +index bf9d6241d5..702feeb3bb 100755 +--- a/.ci/linux-build.sh ++++ b/.ci/linux-build.sh +@@ -25,7 +25,7 @@ function install_dpdk() + export PKG_CONFIG_PATH=$DPDK_LIB/pkgconfig/:$PKG_CONFIG_PATH + + # Expose dpdk binaries. +- export PATH=$(pwd)/dpdk-dir/build/bin:$PATH ++ export PATH=$(pwd)/dpdk-dir/bin:$PATH + + if [ ! -f "${VERSION_FILE}" ]; then + echo "Could not find DPDK in $DPDK_INSTALL_DIR" diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh index 5028bdc442..2a191b57fb 100755 --- a/.ci/linux-prepare.sh @@ -3675,6 +3688,19 @@ index 49ac45275a..7cbea51654 100755 try: sockfd = socket.socket(socket.AF_PACKET, socket.SOCK_RAW) +diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at +index 7cf9bac170..f8ba766739 100644 +--- a/tests/system-dpdk-macros.at ++++ b/tests/system-dpdk-macros.at +@@ -102,7 +102,7 @@ m4_define([OVS_DPDK_CHECK_TESTPMD], + m4_define([OVS_DPDK_START_TESTPMD], + [AT_CHECK([lscpu], [], [stdout]) + AT_CHECK([cat stdout | grep "NUMA node(s)" | awk '{c=1; while (c++<$(3)) {printf "512,"}; print "512"}' > NUMA_NODE]) +- eal_options="$DPDK_EAL_OPTIONS --in-memory --socket-mem="$(cat NUMA_NODE)" --single-file-segments --no-pci" ++ eal_options="$DPDK_EAL_OPTIONS --in-memory --socket-mem="$(cat NUMA_NODE)" --single-file-segments --no-pci --file-prefix testpmd" + options="$1" + test "$options" != "${options%% -- *}" || options="$options -- " + eal_options="$eal_options ${options%% -- *}" diff --git a/tests/system-layer3-tunnels.at b/tests/system-layer3-tunnels.at index 6fbdedb64f..5dcdd2afae 100644 --- a/tests/system-layer3-tunnels.at diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 312d73c..8f93022 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 27%{?dist} +Release: 28%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -767,6 +767,13 @@ exit 0 %endif %changelog +* Fri Jun 07 2024 Open vSwitch CI - 3.3.0-28 +- Merging upstream branch-3.3 [RH git: e5ee6d743e] + Commit list: + 479dd96e18 ci: Restore vhost-user unit tests in check-dpdk. + cc99622485 system-dpdk: Fix socket conflict when starting testpmd. + + * Thu Jun 06 2024 Open vSwitch CI - 3.3.0-27 - Merging upstream branch-3.3 [RH git: 63995fdae6] Commit list: