Merge "gate: bump ovn to the latest LTS release (22.03)"

This commit is contained in:
Zuul 2023-06-06 18:34:27 +00:00 committed by Gerrit Code Review
commit ad81687e29
2 changed files with 8 additions and 4 deletions

View File

@ -68,12 +68,14 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
# The gate should automatically install dependencies.
INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
INSTALL_OVN=${INSTALL_OVN:-True}
OVN_BRANCH=${OVN_BRANCH:-v21.06.0}
Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
# TODO(ihrachys): switch back to a tagged version when it's released
# OVN_BRANCH=${OVN_BRANCH:-v22.03.3}
OVN_BRANCH=${OVN_BRANCH:-36e3ab9b47e93af0599a818e9d6b2930e49473f0}
# 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:-a4b04276ab5934d087669ff2d191a23931335c87}
OVS_BRANCH=${OVS_BRANCH:-2410b95597fcec5f733caf77febdb46f4ffacd27}
if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then

View File

@ -175,8 +175,10 @@
OVN_L3_CREATE_PUBLIC_NETWORK: true
KEYSTONE_ADMIN_ENDPOINT: true
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
# TODO(ihrachys): switch back to a tagged version when it's released
# OVN_BRANCH: "v22.03.3"
OVN_BRANCH: "36e3ab9b47e93af0599a818e9d6b2930e49473f0"
OVS_BRANCH: "2410b95597fcec5f733caf77febdb46f4ffacd27"
devstack_local_conf:
post-config:
"${RALLY_CONF_DIR}/${RALLY_CONF_FILE}":