From e506a2a7938959fa09fc6d10dfb995dc64b00383 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 27 Dec 2024 12:49:28 +0530 Subject: [PATCH] Switch to OVS/OVN LTS branches 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: I8048de20d0c1eb7b56abb699fe83e48b57d91d67 --- tools/configure_for_func_testing.sh | 4 ++-- zuul.d/grenade.yaml | 8 ++++---- zuul.d/rally.yaml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 1489e3789e5..541fc15ffed 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -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 diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 902785f60e0..19690660d12 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -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 diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index 637852f7e44..819a21a9f04 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -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}":