From faead99aa3507577fe32b87a6b405838e83290f1 Mon Sep 17 00:00:00 2001
From: Fernando Royo <froyo@redhat.com>
Date: Fri, 1 Apr 2022 13:29:43 +0200
Subject: [PATCH] [OVN] Pin OVS version for OVN v21.06.0

According to [1], the needed version for OVN v21.06.0 is
a4b04276ab5934d087669ff2d191a23931335c87

[1]https://github.com/ovn-org/ovn/commit/4b0a02635fde3d356851dddf12936d9ff2fcc874

And according to [2], the need version of job using OVN
master is 498cedc483f3239c839c55b4d9f2261b61fb6ace

[2] https://github.com/ovn-org/ovn/commit/576491f50721748ddfb2541ad1ef793ed9cba69d

Related-Bug: #1967472
Change-Id: I63cfc82b329687204e08c2061c6ac8eb7582ab77
---
 zuul.d/base.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 4c573ed8..d3b5816b 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -40,7 +40,7 @@
       Q_BUILD_OVS_FROM_GIT: True
       INSTALL_OVN: True
       OVN_BRANCH: v21.06.0
-      OVS_BRANCH: v2.16.0
+      OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
 
 - job:
     name: ovn-octavia-provider-functional-master
@@ -51,7 +51,7 @@
       Q_BUILD_OVS_FROM_GIT: True
       INSTALL_OVN: True
       OVN_BRANCH: main
-      OVS_BRANCH: master
+      OVS_BRANCH: "91e1ff5dde396fbcc8623ac0726066e970e6de15"
 
 - job:
     name: ovn-octavia-provider-tempest-base
@@ -172,7 +172,7 @@
         Q_BUILD_OVS_FROM_GIT: True
         INSTALL_OVN: True
         OVN_BRANCH: v21.06.0
-        OVS_BRANCH: v2.16.0
+        OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
 
 - job:
     name: ovn-octavia-provider-tempest-master
@@ -183,4 +183,4 @@
         Q_BUILD_OVS_FROM_GIT: True
         INSTALL_OVN: True
         OVN_BRANCH: main
-        OVS_BRANCH: master
+        OVS_BRANCH: "91e1ff5dde396fbcc8623ac0726066e970e6de15"