openstack
/
neutron
Code Issues Proposed changes

[CI] Bump OVS_BRANCH in ovs/ovn source deploy jobs 

Since [1] OVN/OVS source deploy jobs running with
OVN_BRANCH=main fails to compile ovn as this now
requires newer ovs commits from branch-3.2.

[1] https://github.com/ovn-org/ovn/commit/558da0cd

Closes-Bug: #2034096
Change-Id: I5247ce2b1a8606bde807a1744ed37daff04438f1
This commit is contained in:
yatinkarel 2023-09-05 10:28:36 +05:30
parent f7489abaf8
commit c930196dd8
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zuul.d/tempest-multinode.yaml
View File

@ -575,14 +575,12 @@
MYSQL_GATHER_PERFORMANCE: false
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# TODO(ykarel) move to master once OVN main branch is fixed to
# work with https://github.com/openvswitch/ovs/commit/07cf5810de
OVS_BRANCH: e90a0727f17f6ad915a32735a8c0b282f2c8cd6f
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.2
group-vars:
subnode:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# TODO(ykarel) move to master once OVN main branch is fixed to
# work with https://github.com/openvswitch/ovs/commit/07cf5810de
OVS_BRANCH: e90a0727f17f6ad915a32735a8c0b282f2c8cd6f
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.2

10
zuul.d/tempest-singlenode.yaml
View File

@ -634,9 +634,8 @@
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# TODO(ykarel) move to master once OVN main branch is fixed to
# work with https://github.com/openvswitch/ovs/commit/07cf5810de
OVS_BRANCH: e90a0727f17f6ad915a32735a8c0b282f2c8cd6f
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.2
- job:
name: neutron-ovn-tempest-ovs-release-with-oslo-master
@ -785,9 +784,8 @@
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "main"
# TODO(ykarel) move to master once OVN main branch is fixed to
# work with https://github.com/openvswitch/ovs/commit/07cf5810de
OVS_BRANCH: e90a0727f17f6ad915a32735a8c0b282f2c8cd6f
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.2
- job:
name: neutron-ovn-tempest-with-sqlalchemy-master