From 1f5f8965c36c377d96c7d1820c7bffe2963ac178 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Wed, 19 Apr 2023 16:44:20 -0400
Subject: [PATCH] gate: bump ovn to the latest LTS release (22.03)

21.03 is no longer supported upstream. We should try to stick to LTS
releases of OVN if possible.

The patch locks the version as the latest git commit in branch-22.03
(ovs is also locked to the corresponding submodule version). This is
done to include a just merged fix for protocols used for ipv6 address
configuration (ra, na, mld*).

Once 22.03.3 is tagged in OVN repo, we can switch to it.

Depends-On: Id1328d7cba418fa7c227ae9db4fe83c09fd06035
Change-Id: I2a633741d5e95f0e46a6b33198903f0f44d449b6
---
 tools/configure_for_func_testing.sh | 6 ++++--
 zuul.d/rally.yaml                   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index 3014270cdaa..4e1cee090e7 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -68,12 +68,14 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
 # The gate should automatically install dependencies.
 INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
 INSTALL_OVN=${INSTALL_OVN:-True}
-OVN_BRANCH=${OVN_BRANCH:-v21.06.0}
 Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
+# TODO(ihrachys): switch back to a tagged version when it's released
+# OVN_BRANCH=${OVN_BRANCH:-v22.03.3}
+OVN_BRANCH=${OVN_BRANCH:-36e3ab9b47e93af0599a818e9d6b2930e49473f0}
 # OVS_BRANCH needs to be updated along with OVN_BRANCH, ovs is
 # being used as submodule in ovn repo, to get a working ovs
 # version can use git submodule status command on ovn repo
-OVS_BRANCH=${OVS_BRANCH:-a4b04276ab5934d087669ff2d191a23931335c87}
+OVS_BRANCH=${OVS_BRANCH:-2410b95597fcec5f733caf77febdb46f4ffacd27}
 
 
 if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then
diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index b76a9e2f893..3ea72f5aa5a 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -175,8 +175,10 @@
         OVN_L3_CREATE_PUBLIC_NETWORK: true
         KEYSTONE_ADMIN_ENDPOINT: true
         OVN_BUILD_FROM_SOURCE: True
-        OVN_BRANCH: "v21.06.0"
-        OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+        # TODO(ihrachys): switch back to a tagged version when it's released
+        # OVN_BRANCH: "v22.03.3"
+        OVN_BRANCH: "36e3ab9b47e93af0599a818e9d6b2930e49473f0"
+        OVS_BRANCH: "2410b95597fcec5f733caf77febdb46f4ffacd27"
       devstack_local_conf:
         post-config:
           "${RALLY_CONF_DIR}/${RALLY_CONF_FILE}":