diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 0c70264..d6c4d8f 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -35,10 +35,10 @@ index d8a9722809..8db385f002 100644 cpu: 4 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index fc75581486..44491db3e3 100644 +index fc75581486..4a012efd94 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml -@@ -2,6 +2,9 @@ name: Build and Test +@@ -2,13 +2,16 @@ name: Build and Test on: [push, pull_request] @@ -48,6 +48,15 @@ index fc75581486..44491db3e3 100644 jobs: build-dpdk: env: + dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf + CC: gcc +- DPDK_GIT: https://dpdk.org/git/dpdk +- DPDK_VER: 23.11 ++ DPDK_GIT: https://dpdk.org/git/dpdk-stable ++ DPDK_VER: 23.11.1 + name: dpdk gcc + outputs: + dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} @@ -54,7 +57,7 @@ jobs: if: steps.dpdk_cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 @@ -111,6 +120,53 @@ index aa9284fb16..80678854bd 100644 Dhaval Badiani dbadiani@vmware.com DK Moon Ding Zhi zhi.ding@6wind.com +diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst +index 49b987b610..95ce0bf411 100644 +--- a/Documentation/faq/releases.rst ++++ b/Documentation/faq/releases.rst +@@ -216,11 +216,11 @@ Q: What DPDK version does each Open vSwitch release work with? + 2.14.x 19.11.13 + 2.15.x 20.11.6 + 2.16.x 20.11.6 +- 2.17.x 21.11.6 +- 3.0.x 21.11.6 +- 3.1.x 22.11.4 +- 3.2.x 22.11.4 +- 3.3.x 23.11 ++ 2.17.x 21.11.7 ++ 3.0.x 21.11.7 ++ 3.1.x 22.11.5 ++ 3.2.x 22.11.5 ++ 3.3.x 23.11.1 + ============ ======== + + Q: Are all the DPDK releases that OVS versions work with maintained? +diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst +index ad9bdf22c0..93c4a12e75 100644 +--- a/Documentation/intro/install/dpdk.rst ++++ b/Documentation/intro/install/dpdk.rst +@@ -42,7 +42,7 @@ Build requirements + In addition to the requirements described in :doc:`general`, building Open + vSwitch with DPDK will require the following: + +-- DPDK 23.11 ++- DPDK 23.11.1 + + - A `DPDK supported NIC`_ + +@@ -73,9 +73,9 @@ Install DPDK + #. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``:: + + $ cd /usr/src/ +- $ wget https://fast.dpdk.org/rel/dpdk-23.11.tar.xz +- $ tar xf dpdk-23.11.tar.xz +- $ export DPDK_DIR=/usr/src/dpdk-23.11 ++ $ wget https://fast.dpdk.org/rel/dpdk-23.11.1.tar.xz ++ $ tar xf dpdk-23.11.1.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.1 + $ cd $DPDK_DIR + + #. Configure and install DPDK using Meson diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst index 19e360d47c..7eb3a5d370 100644 --- a/Documentation/intro/install/general.rst @@ -180,12 +236,14 @@ index 94f488d183..0b7c832469 100644 touch $@ endif diff --git a/NEWS b/NEWS -index 8888fb3ec5..4bfb341cf4 100644 +index 8888fb3ec5..31d235a401 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,6 @@ +@@ -1,3 +1,8 @@ +v3.3.1 - xx xxx xxxx +-------------------- ++ - DPDK: ++ * OVS validated with DPDK 23.11.1. + v3.3.0 - 16 Feb 2024 -------------------- diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 475c81e..1ec72b0 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: 21%{?dist} +Release: 22%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -767,6 +767,12 @@ exit 0 %endif %changelog +* Thu May 30 2024 Open vSwitch CI - 3.3.0-22 +- Merging upstream branch-3.3 [RH git: 4a1c8a2b9c] + Commit list: + 0ec55bbe95 dpdk: Use DPDK 23.11.1 release for OVS 3.3. + + * Tue May 28 2024 Open vSwitch CI - 3.3.0-21 - Merging upstream branch-3.3 [RH git: 4793020729] Commit list: