From c930196dd84d9d1525014c57e18fa3d9a36c6234 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 5 Sep 2023 10:28:36 +0530 Subject: [PATCH] [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 --- zuul.d/tempest-multinode.yaml | 10 ++++------ zuul.d/tempest-singlenode.yaml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 807692e0bca..28aea19502a 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -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 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index feedc69bee9..0e7e6ce3786 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -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