From 93459c1c8859c7782c490be1ee721c7324321e03 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Mon, 14 Sep 2020 15:03:54 -0400
Subject: [PATCH] ovn: Use new OVS commit hash

We have to pick OVS patches compatible with kernel 4.15.0-118
after switching to it.

Conflicts:
	zuul.d/base.yaml
	zuul.d/tempest-singlenode.yaml

Change-Id: I1ff47fc3398760d5b631bf89e6cfcc7ae339f0e3
Related-bug: #1883601
Closes-bug: #1896766
(cherry picked from commit e10c0dedf43673554eff2670c259e8234b0c65fd)
---
 devstack/lib/ovs               | 2 +-
 zuul.d/base.yaml               | 4 ++--
 zuul.d/tempest-singlenode.yaml | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devstack/lib/ovs b/devstack/lib/ovs
index 744aa0f84a9..b7449ace909 100644
--- a/devstack/lib/ovs
+++ b/devstack/lib/ovs
@@ -17,7 +17,7 @@
 OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
 OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
 OVS_REPO_NAME=${OVS_REPO_NAME:-ovs}
-OVS_BRANCH=${OVS_BRANCH:-51e9479da62edb04a5be47a7655de75c299b9fa1}
+OVS_BRANCH=${OVS_BRANCH:-0047ca3a0290f1ef954f2c76b31477cf4b9755f5}
 
 # Functions
 
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index e6b88b6ec5d..d06ee6f15dd 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -19,8 +19,8 @@
       - ^releasenotes/.*$
     vars:
       OVN_BRANCH: v20.03.0
-      # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created.
-      OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1
+      # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created
+      OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5
       devstack_services:
         # Ignore any default set by devstack. Emit a "disable_all_services".
         base: false
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 3d020a3fb27..337e4c62e76 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -232,8 +232,8 @@
     vars:
       devstack_localrc:
         OVN_BRANCH: v20.03.0
-        # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created
-        OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1
+        # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created
+        OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5
 
 - job:
     name: neutron-ovn-tempest-ovs-release
@@ -242,5 +242,5 @@
     vars:
       devstack_localrc:
         OVN_BRANCH: v20.03.0
-        # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created
-        OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1
+        # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created
+        OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5