diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 4e1cee090e7..6c2be31e2a1 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -69,13 +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} -# TODO(ihrachys): switch back to a tagged version when it's released -# OVN_BRANCH=${OVN_BRANCH:-v22.03.3} -OVN_BRANCH=${OVN_BRANCH:-36e3ab9b47e93af0599a818e9d6b2930e49473f0} +OVN_BRANCH=${OVN_BRANCH:-v23.09.0} # 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:-2410b95597fcec5f733caf77febdb46f4ffacd27} +OVS_BRANCH=${OVS_BRANCH:-v3.2.0-20-g1d78a3f31} if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index 42738550285..70ab6d82562 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -175,10 +175,8 @@ OVN_L3_CREATE_PUBLIC_NETWORK: true KEYSTONE_ADMIN_ENDPOINT: true OVN_BUILD_FROM_SOURCE: True - # TODO(ihrachys): switch back to a tagged version when it's released - # OVN_BRANCH: "v22.03.3" - OVN_BRANCH: "36e3ab9b47e93af0599a818e9d6b2930e49473f0" - OVS_BRANCH: "2410b95597fcec5f733caf77febdb46f4ffacd27" + OVN_BRANCH: "v23.09.0" + OVS_BRANCH: "v3.2.0-20-g1d78a3f31" devstack_local_conf: post-config: "${RALLY_CONF_DIR}/${RALLY_CONF_FILE}":