From d16d791f446713c225ea18b6a43d55283dd044c8 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 26 Aug 2024 13:16:40 -0400 Subject: [PATCH] Add ovs-master job with neutron-plugin enabled We were not running plugin with ovs/ovn main branches before. Note: we should probably add more jobs, e.g. for LTS branches; but this can be discussed separately. Change-Id: Id148db8558e55d2a608b8789923e3821ba74994d --- doc/source/contributor/testing/ci_scenario_jobs.rst | 3 +++ zuul.d/job-templates.yaml | 1 + zuul.d/tempest-singlenode.yaml | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index d9b4c017a03..d981226682a 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -130,6 +130,9 @@ Currently we have in that queue jobs like listed below. |neutron-ovn-tempest-ovs-master |Various tempest api, scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | | |and neutron_tempest_plugi tests | | | | | | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ + |neutron-ovn-tempest-plugin-ovs-master |Various tempest api, scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | + | |and neutron_tempest_plugin tests | | | | | | | | | | + +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-ovn-tempest-with-neutron-lib-master |tempest.api (without slow tests) | 1 | Ubuntu Jammy | openvswitch | openvswitch | legacy | False | False | True | No | | |tempest.scenario | | | | | | | | | | | |(only tests related to | | | | | | | | | | diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index c81c9bc8440..f444b9f720f 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -78,6 +78,7 @@ - neutron-fullstack-with-uwsgi-with-neutron-lib-master - neutron-ovn-tempest-full-multinode-ovs-master - neutron-ovn-tempest-ovs-master + - neutron-ovn-tempest-plugin-ovs-master - neutron-ovn-tempest-ovs-release - neutron-ovs-tempest-with-neutron-lib-master - neutron-ovn-tempest-with-uwsgi-loki diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 65aad0135b0..2cddd2e11e5 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -682,6 +682,18 @@ # NOTE(ykarel): OVN main branch following OVS stable branch OVS_BRANCH: branch-3.4 +- job: + name: neutron-ovn-tempest-plugin-ovs-master + branches: ^master$ + description: Job testing Neutron tempest plugin with ovn driver and OVN master branch + parent: neutron-tempest-plugin-ovn + vars: + devstack_localrc: + OVN_BUILD_FROM_SOURCE: True + OVN_BRANCH: main + # NOTE(ykarel): OVN main branch following OVS stable branch + OVS_BRANCH: branch-3.4 + - job: name: neutron-ovn-tempest-ovs-release-with-oslo-master branches: ^master$