diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 43fee6d66de..3efa5e426a5 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -63,7 +63,7 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False} # The gate should automatically install dependencies. INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE} BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True} -OVN_BRANCH=${OVN_BRANCH:-master} +OVN_BRANCH=${OVN_BRANCH:-main} OVS_BRANCH=${OVS_BRANCH:-master} diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 7c61a6cf3ee..b305106e65d 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -503,11 +503,11 @@ '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs' devstack_localrc: OVN_BUILD_FROM_SOURCE: True - OVN_BRANCH: master + OVN_BRANCH: main OVS_BRANCH: master group-vars: subnode: devstack_localrc: OVN_BUILD_FROM_SOURCE: True - OVN_BRANCH: master + OVN_BRANCH: main OVS_BRANCH: master diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 289b18d8a98..22712967a8c 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -525,7 +525,7 @@ vars: devstack_localrc: OVN_BUILD_FROM_SOURCE: True - OVN_BRANCH: master + OVN_BRANCH: main OVS_BRANCH: master - job: