openstack
/
neutron
Code Issues Proposed changes

Clean "ovn ipv6 only" jobs templates 

We had 2 different kinds of "ovn ipv6 only" jobs defined:

- neutron-ovn-tempest-ovs-release-ipv6-only
- neutron-ovn-tempest-ipv6-only

First of them was running only smoke tempest tests and we had it
in our periodic queue.
Second was run in the check and gate queues and was running all tempest
networking related tests.
That second one was also installing OVS and OVN from sources instead of
the packages provided by the distro.

This patch unifies those 2 jobs so we now have
abstract "neutron-ovn-tempest-ipv6-only-base" and derived from that
2 different jobs:

- neutron-ovn-tempest-ipv6-only-ovs-release - used in check/gate queue,
- neutron-ovn-tempest-ipv6-only-ovs-master - used in periodic queue

Additionally this patch removes "neutron-ovn-tempest-ovs-release" job
from the periodic queue as it is now in the check/gate queue.

Change-Id: I355c5eaca31e12bf980794b1867e1ca39aea96e0
This commit is contained in:
Slawek Kaplonski 2022-10-07 10:12:06 +02:00
parent 721edeeea2
commit 99339a9704
4 changed files with 56 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/contributor/testing/ci_scenario_jobs.rst
View File

@ -82,12 +82,10 @@ Below is a summary of those jobs.
|neutron-ovn-tempest-ovs-release |tempest.api (without slow tests) | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes |
| |tempest.scenario | | | | | | | | | |
+----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-ipv6-only |tempest smoke + IPv6 tests | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes |
|neutron-ovn-tempest-ipv6-only-ovs-release |tempest.api (without slow tests) | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes |
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-ovs-release-ipv6-only | tempest smoke + IPv6 tests | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes |
+----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
Grenade jobs running in Neutron CI
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -143,6 +141,10 @@ Currently we have in that queue jobs like listed below.
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-ipv6-only-ovs-master |tempest.api (without slow tests) | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes |
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
And we also have Grenade jobs in the experimental queue.
::

5
zuul.d/job-templates.yaml
View File

@ -72,7 +72,7 @@
- neutron-ovs-tempest-with-os-ken-master
- neutron-ovn-tempest-postgres-full
- neutron-ovn-tempest-mariadb-full
- neutron-ovn-tempest-ovs-release-ipv6-only
- neutron-ovn-tempest-ipv6-only-ovs-master
- neutron-ovn-tempest-ovs-master-centos-9-stream
- neutron-ovn-tempest-with-neutron-lib-master
- neutron-ovs-tempest-fips
@ -116,8 +116,7 @@
- neutron-ovs-tempest-with-os-ken-master
- neutron-ovn-tempest-postgres-full
- neutron-ovn-tempest-mariadb-full
- neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ovs-release-ipv6-only
- neutron-ovn-tempest-ipv6-only-ovs-master
- neutron-ovn-tempest-ovs-master-centos-9-stream
- neutron-ovn-tempest-with-neutron-lib-master
- neutron-ovs-tempest-fips

5
zuul.d/project.yaml
View File

@ -25,7 +25,7 @@
- neutron-ovs-tempest-multinode-full
- neutron-ovs-tempest-dvr-ha-multinode-full
- neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ipv6-only
- neutron-ovn-tempest-ipv6-only-ovs-release
- neutron-ovn-rally-task:
voting: false
gate:
@ -35,5 +35,4 @@
- neutron-ovs-tempest-multinode-full
- neutron-ovs-grenade-multinode
- neutron-ovs-grenade-dvr-multinode
- neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ipv6-only
- neutron-ovn-tempest-ipv6-only-ovs-release

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

@ -556,56 +556,6 @@
- ^playbooks/.*functional.*$
- ^zuul.d/(?!(project)).*\.yaml
# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
- job:
name: neutron-ovn-tempest-ipv6-only
parent: tempest-ipv6-only
timeout: 10800
vars:
tox_envlist: integrated-network
devstack_localrc:
CIRROS_VERSION: 0.5.1
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
# Cinder services
c-api: false
c-bak: false
c-sch: false
c-vol: false
cinder: false
# Swift services
s-account: false
s-container: false
s-object: false
s-proxy: false
zuul_copy_output:
'/var/log/ovn': 'logs'
'/var/log/openvswitch': 'logs'
'/var/lib/ovn': 'logs'
irrelevant-files: *ovn-irrelevant-files
- job:
name: neutron-ovn-tempest-ovs-ipv6-only-base
description: Base job for devstack/tempest to test Neutron with ovn driver in an IPv6-only deployment
parent: devstack-tempest-ipv6
timeout: 10800
irrelevant-files: *ovn-irrelevant-files
required-projects: *ovn-base-required-projects
vars: *ovn-base-vars
- job:
name: neutron-ovn-tempest-ovs-release-ipv6-only
description: Job testing for devstack/tempest testing Neutron with ovn driver and latest released OVN branch in an IPv6-only deployment
parent: neutron-ovn-tempest-ovs-ipv6-only-base
- job:
name: neutron-ovn-tempest-ovs-release
description: Job testing for devstack/tempest testing Neutron with ovn driver and latest OVN version provided by the packages released in the operating system this job is deployed on
@ -652,7 +602,6 @@
validation:
ssh_key_type: 'ecdsa'
- job:
name: neutron-ovn-tempest-ovs-release-fips
parent: neutron-ovn-tempest-ovs-release
@ -668,3 +617,50 @@
"$TEMPEST_CONFIG":
validation:
ssh_key_type: 'ecdsa'
# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
- job:
name: neutron-ovn-tempest-ipv6-only-base
abstract: true
parent: tempest-ipv6-only
timeout: 10800
vars:
tox_envlist: integrated-network
devstack_localrc:
CIRROS_VERSION: 0.5.1
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
# Cinder services
c-api: false
c-bak: false
c-sch: false
c-vol: false
cinder: false
# Swift services
s-account: false
s-container: false
s-object: false
s-proxy: false
zuul_copy_output:
'/var/log/ovn': 'logs'
'/var/log/openvswitch': 'logs'
'/var/lib/ovn': 'logs'
irrelevant-files: *ovn-irrelevant-files
- job:
name: neutron-ovn-tempest-ipv6-only-ovs-release
parent: neutron-ovn-tempest-ipv6-only-base
- job:
name: neutron-ovn-tempest-ipv6-only-ovs-master
parent: neutron-ovn-tempest-ipv6-only-base
vars:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "main"
OVS_BRANCH: "master"