diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 5df841e..eb533eb 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -1,9 +1,9 @@
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
new file mode 100755
-index 0000000000..1784878962
+index 0000000000..17ce6961fb
--- /dev/null
+++ b/.ci/linux-build.sh
-@@ -0,0 +1,244 @@
+@@ -0,0 +1,242 @@
+#!/bin/bash
+
+set -o errexit
@@ -193,10 +193,8 @@ index 0000000000..1784878962
+ install_dpdk $DPDK_VER
+ # Enable pdump support in OVS.
+ EXTRA_OPTS="${EXTRA_OPTS} --enable-dpdk-pdump"
-+ if [ "$CC" = "clang" ]; then
-+ # Disregard cast alignment errors until DPDK is fixed
-+ CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
-+ fi
++ # Disregard cast alignment errors until DPDK is fixed
++ CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
+fi
+
+if [ "$CC" = "clang" ]; then
@@ -377,10 +375,10 @@ index 1b32f55d65..79271ff147 100644
- ./boot.sh
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
-index 0000000000..c1b88264c2
+index 0000000000..9b951a07d0
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
-@@ -0,0 +1,211 @@
+@@ -0,0 +1,206 @@
+name: Build and Test
+
+on: [push, pull_request]
@@ -389,7 +387,7 @@ index 0000000000..c1b88264c2
+ build-linux:
+ env:
+ dependencies: |
-+ automake libtool gcc bc libjemalloc1 libjemalloc-dev \
++ automake libtool gcc bc libjemalloc2 libjemalloc-dev \
+ libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev \
+ python3-openssl python3-pip python3-sphinx \
+ selinux-policy-dev
@@ -408,7 +406,7 @@ index 0000000000..c1b88264c2
+ TESTSUITE: ${{ matrix.testsuite }}
+
+ name: linux ${{ join(matrix.*, ' ') }}
-+ runs-on: ubuntu-18.04
++ runs-on: ubuntu-20.04
+ timeout-minutes: 30
+
+ strategy:
@@ -449,14 +447,9 @@ index 0000000000..c1b88264c2
+ libs: -ljemalloc
+
+ - compiler: gcc
-+ kernel_list: 5.0 4.20 4.19 4.18 4.17 4.16
-+ - compiler: clang
-+ kernel_list: 5.0 4.20 4.19 4.18 4.17 4.16
-+
-+ - compiler: gcc
-+ kernel_list: 4.15 4.14 4.9 4.4 3.16
++ kernel_list: 4.19 4.14 4.9 4.4 3.16
+ - compiler: clang
-+ kernel_list: 4.15 4.14 4.9 4.4 3.16
++ kernel_list: 4.19 4.14 4.9 4.4 3.16
+
+ - compiler: gcc
+ afxdp: afxdp
@@ -2837,10 +2830,16 @@ index 8e075bc98b..f0ada427e0 100644
[ Open vSwitch team]
* New upstream version
diff --git a/debian/control b/debian/control
-index a50e97249f..6420b9d3e2 100644
+index a50e97249f..27359a297d 100644
--- a/debian/control
+++ b/debian/control
-@@ -14,8 +14,9 @@ Build-Depends: graphviz,
+@@ -9,13 +9,15 @@ Build-Depends: graphviz,
+ bzip2,
+ debhelper (>= 8),
+ dh-autoreconf,
++ dh-python,
+ libssl-dev,
+ libtool,
openssl,
procps,
python3-all,
@@ -2852,7 +2851,7 @@ index a50e97249f..6420b9d3e2 100644
libunbound-dev,
libunwind-dev
Standards-Version: 3.9.3
-@@ -187,7 +188,7 @@ Description: Python bindings for Open vSwitch
+@@ -187,7 +189,7 @@ Description: Python bindings for Open vSwitch
Package: openvswitch-test
Architecture: all
Depends: python3,
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 46af9d7..7b76416 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
Group: System Environment/Daemons daemon/database/utilities
URL: http://www.openvswitch.org/
Version: 2.13.0
-Release: 196%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 197%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,13 @@ exit 0
%endif
%changelog
+* Fri Aug 12 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-197
+- Merging upstream branch-2.13 [RH git: 8daa2a434e]
+ Commit list:
+ 1ed3925194 github: Move CI to ubuntu 20.04 base image.
+ 9bed06ab05 github: Remove kernels that fail to build with newer compilers.
+
+
* Mon Aug 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-196
- Merging upstream branch-2.13 [RH git: e447babd7c]
Commit list: