From 1d46b199517ce93066dc9b989cb6e1e078f701b8 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Sun, 11 Dec 2022 21:45:21 +0100 Subject: [PATCH] Pin OVS_BRANCH to master again 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]https://github.com/ovn-org/ovn/commit/1b0dbde940706e5de6e60221be78a278361fa76d Related-Bug: #1999154 Change-Id: I31cc4ef324aa9112b4ba9409025495af6813a80b --- zuul.d/tempest-multinode.yaml | 8 ++------ zuul.d/tempest-singlenode.yaml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 8231c82994a..ce1d49454fc 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -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 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 78e42ab8f2e..26d6951a258 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -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