openstack/devstack
Code Issues Proposed changes

Switch to OVS/OVN LTS branches

Browse Source 
As discussed in Epoxy PTG[1] switching jobs to run
with latest OVS/OVN LTS branches.
Ubuntu noble and CentOS 9-stream also including these
LTS versions.

[1] https://etherpad.opendev.org/p/oct2024-ptg-neutron

Change-Id: Iecb33628641cd33b6e46d09759e3180cc0bd55e9
This commit is contained in:
yatinkarel 2024-12-27 13:01:16 +05:30
parent 05f7d302cf
commit bf04bf517b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -745,8 +745,8 @@
vars: vars:
devstack_localrc: devstack_localrc:
OVN_BUILD_FROM_SOURCE: True OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v21.06.0" OVN_BRANCH: "branch-24.03"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87" OVS_BRANCH: "branch-3.3"
OVS_SYSCONFDIR: "/usr/local/etc/openvswitch" OVS_SYSCONFDIR: "/usr/local/etc/openvswitch"
- job: - job:

2
lib/neutron_plugins/ovn_agent
View File

@ -28,7 +28,7 @@ source ${TOP_DIR}/lib/neutron_plugins/ovs_source
OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git} OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git}
OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.') OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
OVN_REPO_NAME=${OVN_REPO_NAME:-ovn} OVN_REPO_NAME=${OVN_REPO_NAME:-ovn}
OVN_BRANCH=${OVN_BRANCH:-v20.06.1} OVN_BRANCH=${OVN_BRANCH:-branch-24.03}
# The commit removing OVN bits from the OVS tree, it is the commit that is not # The commit removing OVN bits from the OVS tree, it is the commit that is not
# present in OVN tree and is used to distinguish if OVN is part of OVS or not. # present in OVN tree and is used to distinguish if OVN is part of OVS or not.
# https://github.com/openvswitch/ovs/commit/05bf1dbb98b0635a51f75e268ef8aed27601401d # https://github.com/openvswitch/ovs/commit/05bf1dbb98b0635a51f75e268ef8aed27601401d

2
lib/neutron_plugins/ovs_source
View File

@ -20,7 +20,7 @@ Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git} OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.') OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
OVS_REPO_NAME=${OVS_REPO_NAME:-ovs} OVS_REPO_NAME=${OVS_REPO_NAME:-ovs}
OVS_BRANCH=${OVS_BRANCH:-0047ca3a0290f1ef954f2c76b31477cf4b9755f5} OVS_BRANCH=${OVS_BRANCH:-branch-3.3}
# Functions # Functions