diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index e44112f6fc5..c26fc852fb5 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -33,7 +33,7 @@ source $NEUTRON_DIR/devstack/lib/ovs OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git} OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.') OVN_REPO_NAME=${OVN_REPO_NAME:-ovn} -OVN_BRANCH=${OVN_BRANCH:-v20.03.0} +OVN_BRANCH=${OVN_BRANCH:-v20.06.1} # The commit removing OVN bits from the OVS tree, it is the commit that is not # present in OVN tree and is used to distinguish if OVN is part of OVS or not. # https://github.com/openvswitch/ovs/commit/05bf1dbb98b0635a51f75e268ef8aed27601401d diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 00afe65cefc..f3f8a10e88b 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -18,7 +18,7 @@ - ^neutron/locale/.*$ - ^releasenotes/.*$ vars: - OVN_BRANCH: v20.03.0 + OVN_BRANCH: v20.06.1 # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created. OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1 devstack_services: diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index ba70ca1201d..931406fa110 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -270,7 +270,7 @@ parent: neutron-ovn-tempest-ovs-ipv6-only-base vars: devstack_localrc: - OVN_BRANCH: v20.03.0 + OVN_BRANCH: v20.06.1 # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1 @@ -280,7 +280,7 @@ parent: neutron-ovn-base vars: devstack_localrc: - OVN_BRANCH: v20.03.0 + OVN_BRANCH: v20.06.1 # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1