openstack
/
ovn-octavia-provider
Code Issues Proposed changes

Fix pep8 and functional jobs 

This change includes a 3 different patches that we need
to squash in order to pass the gate.

1) New versions of isort broke pylint. This patch fixes it at 4.3.21.

2) The functional job fails because of bugfixes in neutron
devstack lib. We need to update our functional jobs also.

3) Add functional release and master job that builds OVN

In order to test the latest code in the core OVN repository,
add a job that builds it from source from the master branch.

Define also second job that will run code with latest
OVN/OVS release.

Closes-Bug: #1887363
Change-Id: Ic013e5a0605c28453d3ee1b64031022f6f75f8f6
(cherry picked from commit 773daf59de)
This commit is contained in:
Maciej Józefczyk 2020-07-13 09:24:59 +02:00
parent 2448c4925b
commit 2f60a91809
5 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lower-constraints.txt
View File

@ -34,6 +34,7 @@ hacking==1.1.0
idna==2.6
imagesize==0.7.1
iso8601==0.1.11
isort==4.3.21
Jinja2==2.10
jmespath==0.9.0
jsonpatch==1.16

11
roles/configure_functional_tests/tasks/main.yaml
View File

@ -8,13 +8,18 @@
BASE_DIR={{ base_dir }}
GATE_DEST={{ gate_dest_dir }}
PROJECT_NAME={{ project_name }}
NEUTRON_PATH={{ neutron_dir }}
NEUTRON_DIR={{ neutron_dir }}
DEVSTACK_PATH={{ devstack_dir }}
TOP_DIR={{ devstack_dir }}
VENV={{ tests_venv }}
STACK_USER=stack
OVS_BRANCH={{ OVS_BRANCH }}
OVN_BRANCH={{ OVN_BRANCH }}
source $DEVSTACK_PATH/functions
source $NEUTRON_PATH/devstack/lib/ovs
source $NEUTRON_PATH/tools/configure_for_func_testing.sh
source $NEUTRON_DIR/devstack/lib/ovs
source $NEUTRON_DIR/devstack/lib/ovn_agent
source $NEUTRON_DIR/tools/configure_for_func_testing.sh
configure_host_for_func_testing
executable: /bin/bash

1
test-requirements.txt
View File

@ -12,6 +12,7 @@ oslotest>=3.2.0 # Apache-2.0
os-testr>=1.0.0 # Apache-2.0
astroid==2.1.0 # LGPLv2.1
pylint==2.3.0 # GPLv2
isort==4.3.21 # MIT
octavia-lib>=1.3.1 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD

18
zuul.d/base.yaml
View File

@ -1,5 +1,5 @@
- job:
name: ovn-octavia-provider-functional
name: ovn-octavia-provider-functional-base
parent: devstack-minimal
description: Run OVN Octavia provider functional tests
timeout: 7800
@ -31,6 +31,22 @@
# tox.ini file
'{{ devstack_base_dir }}/logs/dsvm-functional-logs': logs
- job:
name: ovn-octavia-provider-functional-release
parent: ovn-octavia-provider-functional-base
description: Run OVN Octavia provider functional tests
vars:
OVN_BRANCH: v20.06.0
OVS_BRANCH: v2.13.0
- job:
name: ovn-octavia-provider-functional-master
parent: ovn-octavia-provider-functional-base
description: Run OVN Octavia provider functional tests - OVN master
vars:
OVN_BRANCH: master
OVS_BRANCH: master
- job:
name: ovn-octavia-provider-dsvm-base
parent: devstack-tempest

6
zuul.d/project.yaml
View File

@ -10,10 +10,12 @@
- openstack-tox-cover:
required-projects:
- openstack/neutron
- ovn-octavia-provider-functional
- ovn-octavia-provider-functional-release
- ovn-octavia-provider-functional-master
- ovn-octavia-provider-v2-dsvm-scenario
gate:
fail-fast: true
jobs:
- ovn-octavia-provider-functional
- ovn-octavia-provider-functional-release
- ovn-octavia-provider-functional-master
- ovn-octavia-provider-v2-dsvm-scenario