openstack/neutron
Code Issues Proposed changes

ovn: Use new OVS commit hash

Browse Source 
We have to pick OVS patches compatible with kernel 4.15.0-118
after switching to it.

Change-Id: I1ff47fc3398760d5b631bf89e6cfcc7ae339f0e3
Related-bug: #1883601
Closes-bug: #1896766
This commit is contained in:
Brian Haley 2020-09-14 15:03:54 -04:00 committed by Jakub Libosvar
parent a1d89e6f0e
commit e10c0dedf4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ovs
View File

@ -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

4
zuul.d/base.yaml
View File

@ -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

8
zuul.d/tempest-singlenode.yaml
View File

@ -309,8 +309,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
@ -319,8 +319,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