diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index c5e2f0530b3..4bb59f72e0a 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -581,12 +581,10 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.4 + OVS_BRANCH: main 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.4 + OVS_BRANCH: main diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 2cddd2e11e5..5b28220ea70 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -679,8 +679,7 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.4 + OVS_BRANCH: main - job: name: neutron-ovn-tempest-plugin-ovs-master @@ -691,8 +690,7 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.4 + OVS_BRANCH: main - job: name: neutron-ovn-tempest-ovs-release-with-oslo-master @@ -840,8 +838,7 @@ devstack_localrc: OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: "main" - # NOTE(ykarel): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.4 + OVS_BRANCH: main - job: name: neutron-ovn-tempest-with-sqlalchemy-master