diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 6d9b35b..b146f89 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -1,3 +1,303 @@
+diff --git a/.ci/dpdk-build.sh b/.ci/dpdk-build.sh
+new file mode 100755
+index 000000000..02dcefef6
+--- /dev/null
++++ b/.ci/dpdk-build.sh
+@@ -0,0 +1,54 @@
++#!/bin/bash
++
++set -o errexit
++set -x
++
++function build_dpdk()
++{
++ local VERSION_FILE="dpdk-dir/cached-version"
++ local DPDK_VER=$1
++ local DPDK_OPTS=""
++
++ rm -rf dpdk-dir
++
++ if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
++ git clone --single-branch $DPDK_GIT dpdk-dir -b "${DPDK_VER##refs/*/}"
++ pushd dpdk-dir
++ git log -1 --oneline
++ else
++ wget https://fast.dpdk.org/rel/dpdk-$1.tar.xz
++ tar xvf dpdk-$1.tar.xz > /dev/null
++ DIR_NAME=$(tar -tf dpdk-$1.tar.xz | head -1 | cut -f1 -d"/")
++ mv ${DIR_NAME} dpdk-dir
++ pushd dpdk-dir
++ fi
++
++ # Switching to 'default' machine to make dpdk-dir cache usable on
++ # different CPUs. We can't be sure that all CI machines are exactly same.
++ DPDK_OPTS="$DPDK_OPTS -Dmachine=default"
++
++ # Disable building DPDK unit tests. Not needed for OVS build or tests.
++ DPDK_OPTS="$DPDK_OPTS -Dtests=false"
++
++ # Disable DPDK developer mode, this results in less build checks and less
++ # meson verbose outputs.
++ DPDK_OPTS="$DPDK_OPTS -Ddeveloper_mode=disabled"
++
++ # OVS compilation and "normal" unit tests (run in the CI) do not depend on
++ # any DPDK driver being present.
++ # We can disable all drivers to save compilation time.
++ DPDK_OPTS="$DPDK_OPTS -Ddisable_drivers=*/*"
++
++ # Install DPDK using prefix.
++ DPDK_OPTS="$DPDK_OPTS --prefix=$(pwd)/build"
++
++ meson $DPDK_OPTS build
++ ninja -C build
++ ninja -C build install
++
++ echo "Installed DPDK in $(pwd)"
++ popd
++ echo "${DPDK_VER}" > ${VERSION_FILE}
++}
++
++build_dpdk $DPDK_VER
+diff --git a/.ci/dpdk-prepare.sh b/.ci/dpdk-prepare.sh
+new file mode 100755
+index 000000000..f7e6215dd
+--- /dev/null
++++ b/.ci/dpdk-prepare.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++
++set -ev
++
++# Installing wheel separately because it may be needed to build some
++# of the packages during dependency backtracking and pip >= 22.0 will
++# abort backtracking on build failures:
++# https://github.com/pypa/pip/issues/10655
++pip3 install --disable-pip-version-check --user wheel
++pip3 install --disable-pip-version-check --user pyelftools
++pip3 install --user 'meson==0.53.2'
+diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
+index 10021fddb..99850a943 100755
+--- a/.ci/linux-build.sh
++++ b/.ci/linux-build.sh
+@@ -9,9 +9,7 @@ EXTRA_OPTS="--enable-Werror"
+
+ function install_dpdk()
+ {
+- local DPDK_VER=$1
+ local VERSION_FILE="dpdk-dir/cached-version"
+- local DPDK_OPTS=""
+ local DPDK_LIB=$(pwd)/dpdk-dir/build/lib/x86_64-linux-gnu
+
+ if [ "$DPDK_SHARED" ]; then
+@@ -24,63 +22,14 @@ function install_dpdk()
+ # Export the following path for pkg-config to find the .pc file.
+ export PKG_CONFIG_PATH=$DPDK_LIB/pkgconfig/:$PKG_CONFIG_PATH
+
+- if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
+- # Avoid using cache for git tree build.
+- rm -rf dpdk-dir
+-
+- DPDK_GIT=${DPDK_GIT:-https://dpdk.org/git/dpdk}
+- git clone --single-branch $DPDK_GIT dpdk-dir -b "${DPDK_VER##refs/*/}"
+- pushd dpdk-dir
+- git log -1 --oneline
+- else
+- if [ -f "${VERSION_FILE}" ]; then
+- VER=$(cat ${VERSION_FILE})
+- if [ "${VER}" = "${DPDK_VER}" ]; then
+- # Update the library paths.
+- sudo ldconfig
+- echo "Found cached DPDK ${VER} build in $(pwd)/dpdk-dir"
+- return
+- fi
+- fi
+- # No cache or version mismatch.
+- rm -rf dpdk-dir
+- wget https://fast.dpdk.org/rel/dpdk-$1.tar.xz
+- tar xvf dpdk-$1.tar.xz > /dev/null
+- DIR_NAME=$(tar -tf dpdk-$1.tar.xz | head -1 | cut -f1 -d"/")
+- mv ${DIR_NAME} dpdk-dir
+- pushd dpdk-dir
++ if [ ! -f "${VERSION_FILE}" ]; then
++ echo "Could not find DPDK in $(pwd)/dpdk-dir"
++ return 1
+ fi
+
+- # Switching to 'default' machine to make dpdk-dir cache usable on
+- # different CPUs. We can't be sure that all CI machines are exactly same.
+- DPDK_OPTS="$DPDK_OPTS -Dmachine=default"
+-
+- # Disable building DPDK unit tests. Not needed for OVS build or tests.
+- DPDK_OPTS="$DPDK_OPTS -Dtests=false"
+-
+- # Disable DPDK developer mode, this results in less build checks and less
+- # meson verbose outputs.
+- DPDK_OPTS="$DPDK_OPTS -Ddeveloper_mode=disabled"
+-
+- # OVS compilation and "normal" unit tests (run in the CI) do not depend on
+- # any DPDK driver being present.
+- # We can disable all drivers to save compilation time.
+- DPDK_OPTS="$DPDK_OPTS -Ddisable_drivers=*/*"
+-
+- # Install DPDK using prefix.
+- DPDK_OPTS="$DPDK_OPTS --prefix=$(pwd)/build"
+-
+- CC=gcc meson $DPDK_OPTS build
+- ninja -C build
+- ninja -C build install
+-
+ # Update the library paths.
+ sudo ldconfig
+-
+-
+- echo "Installed DPDK source in $(pwd)"
+- popd
+- echo "${DPDK_VER}" > ${VERSION_FILE}
++ echo "Found cached DPDK $(cat ${VERSION_FILE}) build in $(pwd)/dpdk-dir"
+ }
+
+ function configure_ovs()
+@@ -130,10 +79,7 @@ assert ovs.json.from_string('{\"a\": 42}') == {'a': 42}"
+ fi
+
+ if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
+- if [ -z "$DPDK_VER" ]; then
+- DPDK_VER="22.11.1"
+- fi
+- install_dpdk $DPDK_VER
++ install_dpdk
+ fi
+
+ if [ "$CC" = "clang" ]; then
+diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh
+index f414a879c..c28b6819a 100755
+--- a/.ci/linux-prepare.sh
++++ b/.ci/linux-prepare.sh
+@@ -23,8 +23,7 @@ cd ..
+ # https://github.com/pypa/pip/issues/10655
+ pip3 install --disable-pip-version-check --user wheel
+ pip3 install --disable-pip-version-check --user \
+- flake8 'hacking>=3.0' netaddr pyparsing sphinx setuptools pyelftools
+-pip3 install --user 'meson==0.53.2'
++ flake8 'hacking>=3.0' netaddr pyparsing sphinx setuptools
+
+ # Install python test dependencies
+ pip3 install -r python/test_requirements.txt
+diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
+index 82675b973..8e71b9533 100644
+--- a/.github/workflows/build-and-test.yml
++++ b/.github/workflows/build-and-test.yml
+@@ -3,12 +3,80 @@ name: Build and Test
+ on: [push, pull_request]
+
+ jobs:
++ build-dpdk:
++ env:
++ dependencies: gcc libnuma-dev ninja-build
++ CC: gcc
++ DPDK_GIT: https://dpdk.org/git/dpdk-stable
++ DPDK_VER: 22.11.1
++ name: dpdk gcc
++ outputs:
++ dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
++ runs-on: ubuntu-20.04
++ timeout-minutes: 30
++
++ steps:
++ - name: checkout
++ uses: actions/checkout@v3
++
++ - name: update PATH
++ run: |
++ echo "$HOME/bin" >> $GITHUB_PATH
++ echo "$HOME/.local/bin" >> $GITHUB_PATH
++
++ - name: create ci signature file for the dpdk cache key
++ # This will collect most of DPDK related lines, so hash will be different
++ # if something changed in a way we're building DPDK including DPDK_VER.
++ # This also allows us to use cache from any branch as long as version
++ # and a way we're building DPDK stays the same.
++ run: |
++ grep -irE 'RTE_|DPDK|meson|ninja' .ci/dpdk-* > dpdk-ci-signature
++ grep -rwE 'DPDK_GIT|DPDK_VER' .github/ >> dpdk-ci-signature
++ if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
++ git ls-remote --heads $DPDK_GIT $DPDK_VER >> dpdk-ci-signature
++ fi
++ cat dpdk-ci-signature
++
++ - name: generate ci DPDK key
++ id: gen_dpdk_key
++ env:
++ ci_key: ${{ hashFiles('dpdk-ci-signature') }}
++ run: echo 'key=dpdk-${{ env.ci_key }}' >> $GITHUB_OUTPUT
++
++ - name: cache
++ id: dpdk_cache
++ uses: actions/cache@v3
++ with:
++ path: dpdk-dir
++ key: ${{ steps.gen_dpdk_key.outputs.key }}
++
++ - name: set up python
++ if: steps.dpdk_cache.outputs.cache-hit != 'true'
++ uses: actions/setup-python@v4
++ with:
++ python-version: '3.9'
++
++ - name: update APT cache
++ if: steps.dpdk_cache.outputs.cache-hit != 'true'
++ run: sudo apt update || true
++ - name: install common dependencies
++ if: steps.dpdk_cache.outputs.cache-hit != 'true'
++ run: sudo apt install -y ${{ env.dependencies }}
++
++ - name: prepare
++ if: steps.dpdk_cache.outputs.cache-hit != 'true'
++ run: ./.ci/dpdk-prepare.sh
++
++ - name: build
++ if: steps.dpdk_cache.outputs.cache-hit != 'true'
++ run: ./.ci/dpdk-build.sh
++
+ build-linux:
++ needs: build-dpdk
+ env:
+ dependencies: |
+- automake libtool gcc bc libjemalloc2 libjemalloc-dev \
+- libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev \
+- ninja-build selinux-policy-dev libbpf-dev
++ automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \
++ llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev
+ ASAN: ${{ matrix.asan }}
+ UBSAN: ${{ matrix.ubsan }}
+ CC: ${{ matrix.compiler }}
+@@ -104,25 +172,12 @@ jobs:
+ with:
+ python-version: '3.9'
+
+- - name: create ci signature file for the dpdk cache key
+- if: matrix.dpdk != '' || matrix.dpdk_shared != ''
+- # This will collect most of DPDK related lines, so hash will be different
+- # if something changed in a way we're building DPDK including DPDK_VER.
+- # This also allows us to use cache from any branch as long as version
+- # and a way we're building DPDK stays the same.
+- run: |
+- grep -irE 'RTE_|DPDK|meson|ninja' -r .ci/ > dpdk-ci-signature
+- cat dpdk-ci-signature
+-
+ - name: cache
+ if: matrix.dpdk != '' || matrix.dpdk_shared != ''
+ uses: actions/cache@v3
+- env:
+- matrix_key: ${{ matrix.dpdk }}${{ matrix.dpdk_shared }}
+- ci_key: ${{ hashFiles('dpdk-ci-signature') }}
+ with:
+ path: dpdk-dir
+- key: ${{ env.matrix_key }}-${{ env.ci_key }}
++ key: ${{ needs.build-dpdk.outputs.dpdk_key }}
+
+ - name: update APT cache
+ run: sudo apt update || true
diff --git a/Documentation/ref/ovs-actions.7.rst b/Documentation/ref/ovs-actions.7.rst
index b59b7634f..d13895655 100644
--- a/Documentation/ref/ovs-actions.7.rst
@@ -11,6 +311,19 @@ index b59b7634f..d13895655 100644
supported.
This action was added in Open vSwitch 2.14.
+diff --git a/Makefile.am b/Makefile.am
+index e605187b8..df9c33dfe 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -75,6 +75,8 @@ EXTRA_DIST = \
+ MAINTAINERS.rst \
+ README.rst \
+ NOTICE \
++ .ci/dpdk-build.sh \
++ .ci/dpdk-prepare.sh \
+ .ci/linux-build.sh \
+ .ci/linux-prepare.sh \
+ .ci/osx-build.sh \
diff --git a/NEWS b/NEWS
index 37a01dea5..e59f9530b 100644
--- a/NEWS
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 7adf3a5..7ec833f 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
Group: System Environment/Daemons daemon/database/utilities
URL: http://www.openvswitch.org/
Version: 3.1.0
-Release: 22%{?dist}
+Release: 23%{?dist}
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
@@ -751,6 +751,12 @@ exit 0
%endif
%changelog
+* Fri May 05 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-23
+- Merging upstream branch-3.1 [RH git: b4785c720a]
+ Commit list:
+ bf9c834e64 ci: Separate DPDK from OVS build.
+
+
* Thu May 04 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-22
- Merging upstream branch-3.1 [RH git: 390827119b]
Commit list: