From 70f9dd926f7433569df59c2f309f4239b8e8e7c9 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 16 Jan 2024 13:03:47 +0530 Subject: [PATCH] update OVS_BRANCH to be compatible with ovn main branch Required since [1] included in ovn repo. [1] https://github.com/ovn-org/ovn/commit/66ef670 Closes-Bug: #2049488 Change-Id: Ia50937dd81a33da8297576e91aa69e1897899529 --- zuul.d/tempest-multinode.yaml | 6 ++---- zuul.d/tempest-singlenode.yaml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 88abe1b857e..96c39770326 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -570,12 +570,10 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.2 + OVS_BRANCH: 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 group-vars: subnode: devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.2 + OVS_BRANCH: 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 83c2b03bc1f..ea9e34a43cc 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -629,8 +629,7 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.2 + OVS_BRANCH: 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 - job: name: neutron-ovn-tempest-ovs-release-with-oslo-master @@ -778,8 +777,7 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: "main" - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.2 + OVS_BRANCH: 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 - job: name: neutron-ovn-tempest-with-sqlalchemy-master