Merge "Switch to OVS/OVN LTS branches"

This commit is contained in:
Zuul 2025-01-06 11:42:35 +00:00 committed by Gerrit Code Review
commit 72f0e9cde6
3 changed files with 8 additions and 8 deletions

View File

@ -69,11 +69,11 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
INSTALL_OVN=${INSTALL_OVN:-True}
Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
OVN_BRANCH=${OVN_BRANCH:-v23.09.0}
OVN_BRANCH=${OVN_BRANCH:-branch-24.03}
# OVS_BRANCH needs to be updated along with OVN_BRANCH, ovs is
# being used as submodule in ovn repo, to get a working ovs
# version can use git submodule status command on ovn repo
OVS_BRANCH=${OVS_BRANCH:-v3.2.0-20-g1d78a3f31}
OVS_BRANCH=${OVS_BRANCH:-branch-3.3}
if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then

View File

@ -285,8 +285,8 @@
Q_BUILD_OVS_FROM_GIT: true
OVN_BUILD_MODULES: true
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
OVN_BRANCH: "branch-24.03"
OVS_BRANCH: "branch-3.3"
new:
Q_BUILD_OVS_FROM_GIT: false
OVN_BUILD_MODULES: false
@ -370,8 +370,8 @@
Q_BUILD_OVS_FROM_GIT: true
OVN_BUILD_MODULES: true
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
OVN_BRANCH: "branch-24.03"
OVS_BRANCH: "branch-3.3"
new:
Q_BUILD_OVS_FROM_GIT: false
OVN_BUILD_MODULES: false

View File

@ -185,8 +185,8 @@
OVN_L3_CREATE_PUBLIC_NETWORK: true
KEYSTONE_ADMIN_ENDPOINT: true
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v23.09.0"
OVS_BRANCH: "v3.2.0-20-g1d78a3f31"
OVN_BRANCH: "branch-24.03"
OVS_BRANCH: "branch-3.3"
devstack_local_conf:
post-config:
"${RALLY_CONF_DIR}/${RALLY_CONF_FILE}":