diff --git a/devstack/lib/ovs b/devstack/lib/ovs index 744aa0f84a9..b7449ace909 100644 --- a/devstack/lib/ovs +++ b/devstack/lib/ovs @@ -17,7 +17,7 @@ OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git} OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.') OVS_REPO_NAME=${OVS_REPO_NAME:-ovs} -OVS_BRANCH=${OVS_BRANCH:-51e9479da62edb04a5be47a7655de75c299b9fa1} +OVS_BRANCH=${OVS_BRANCH:-0047ca3a0290f1ef954f2c76b31477cf4b9755f5} # Functions diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index f3f8a10e88b..4342d508bda 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -19,8 +19,8 @@ - ^releasenotes/.*$ vars: 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 + # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created + OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5 devstack_services: # Ignore any default set by devstack. Emit a "disable_all_services". base: false diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index f7f0e162c15..2f54cb54cf7 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -312,8 +312,8 @@ vars: devstack_localrc: 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 + # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created + OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5 - job: name: neutron-ovn-tempest-ovs-release @@ -322,8 +322,8 @@ vars: devstack_localrc: 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 + # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created + OVS_BRANCH: 0047ca3a0290f1ef954f2c76b31477cf4b9755f5 - job: name: neutron-ovn-tempest-ovs-master-fedora