Use main branch for ovs in master job

devstack uses bundled ovs to build ovn, and ovs is built independently
from its source.

Change-Id: I3d0b2231072523fc4e54c194541926972df3bbed
Depends-on: https://review.opendev.org/c/openstack/devstack/+/838782
Signed-off-by: Takashi Kajinami <[email protected]>

Author: kajinamit

zuul.d/base.yaml

@@ -51,8 +51,7 @@
       Q_BUILD_OVS_FROM_GIT: True
       INSTALL_OVN: True
       OVN_BRANCH: main
-      # NOTE(froyo): OVN main branch following OVS stable branch
-      OVS_BRANCH: branch-3.4
+      OVS_BRANCH: main
 
 - job:
     name: ovn-octavia-provider-tempest-base
@@ -182,5 +181,4 @@
         OVN_BUILD_FROM_SOURCE: True
         INSTALL_OVN: True
         OVN_BRANCH: main
-        # NOTE(froyo): OVN main branch following OVS stable branch
-        OVS_BRANCH: branch-3.4
+        OVS_BRANCH: main