openstack/neutron
Code Issues Proposed changes

Pin OVS_BRANCH to master again

Browse Source 
This patch reverts [1] and [2] now [3] has been merged in the
OVN repository.

[1]https://review.opendev.org/c/openstack/neutron/+/867004
[2]https://review.opendev.org/c/openstack/neutron/+/867522
[3]1b0dbde940

Related-Bug: #1999154

Change-Id: I31cc4ef324aa9112b4ba9409025495af6813a80b
This commit is contained in:
Rodolfo Alonso Hernandez 2022-12-11 21:45:21 +01:00
parent c3950b8d9f
commit 1d46b19951
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,14 +521,10 @@
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/b8bf410
OVS_BRANCH: a77c7796f23a76190b61e2109a009df980253b0f
OVS_BRANCH: master
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/b8bf410
OVS_BRANCH: a77c7796f23a76190b61e2109a009df980253b0f
OVS_BRANCH: master

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

@ -611,9 +611,7 @@
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/b8bf410
OVS_BRANCH: a77c7796f23a76190b61e2109a009df980253b0f
OVS_BRANCH: master
- job:
name: neutron-ovn-tempest-ovs-release-with-oslo-master
@ -745,6 +743,4 @@
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/b8bf410
OVS_BRANCH: a77c7796f23a76190b61e2109a009df980253b0f
OVS_BRANCH: master