diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index 96934ed0b51..29dc8cc8b91 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -127,12 +127,25 @@ Currently we have in that queue jobs like listed below. |neutron-ovn-tempest-full-multinode-ovs-master |Various tempest api and scenario | 2 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | | |tests | | | | | | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ + |neutron-ovn-tempest-full-multinode-ovs-lts |Various tempest api and scenario | 2 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | + | |tests using latest OVS and OVN | | | | | | | | | | + | |LTS branches | | | | | | | | | | + +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-ovn-tempest-ovs-master |Various tempest api and scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | - | |tests | | | | | | | | | | + | |tests | | | | | | | | | | + +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ + |neutron-ovn-tempest-ovs-lts |Various tempest api and scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | + | |tests using latest OVS and OVN | | | | | | | | | | + | |LTS branches | | | | | | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-ovn-tempest-plugin-ovs-master |Various tempest api, scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | | |and neutron_tempest_plugin tests | | | | | | | | | | +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ + |neutron-ovn-tempest-plugin-ovs-lts |Various tempest api, scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No | + | |and neutron_tempest_plugin | | | | | | | | | | + | |test using latest OVS and OVN LTS | | | | | | | | | | + | |branches | | | | | | | | | | + +----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+ |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 f444b9f720f..55542efb030 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -77,8 +77,11 @@ - neutron-functional-with-uwsgi-with-neutron-lib-master - neutron-fullstack-with-uwsgi-with-neutron-lib-master - neutron-ovn-tempest-full-multinode-ovs-master + - neutron-ovn-tempest-full-multinode-ovs-lts - neutron-ovn-tempest-ovs-master + - neutron-ovn-tempest-ovs-lts - neutron-ovn-tempest-plugin-ovs-master + - neutron-ovn-tempest-plugin-ovs-lts - neutron-ovn-tempest-ovs-release - neutron-ovs-tempest-with-neutron-lib-master - neutron-ovn-tempest-with-uwsgi-loki diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 4bb59f72e0a..8461700a716 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -536,8 +536,7 @@ tempest_test_regex: "" - job: - # TODO(slaweq): propose job with ovs-release and move -master one to - # experimental queue + # TODO(slaweq): move -master one to experimental queue name: neutron-ovn-tempest-full-multinode-ovs-master branches: ^master$ parent: neutron-ovn-multinode-base @@ -588,3 +587,19 @@ OVN_BUILD_FROM_SOURCE: True OVN_BRANCH: main OVS_BRANCH: main + +- job: + name: neutron-ovn-tempest-full-multinode-ovs-lts + branches: ^master$ + parent: neutron-ovn-tempest-full-multinode-ovs-master + vars: + devstack_localrc: + OVN_BUILD_FROM_SOURCE: True + OVN_BRANCH: branch-24.03 + OVS_BRANCH: branch-3.3 + group-vars: + subnode: + devstack_localrc: + OVN_BUILD_FROM_SOURCE: True + OVN_BRANCH: branch-24.03 + OVS_BRANCH: branch-3.3 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 5b28220ea70..2251b3ae152 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -681,6 +681,17 @@ OVN_BRANCH: main OVS_BRANCH: main +- job: + name: neutron-ovn-tempest-ovs-lts + branches: ^master$ + description: Job testing for devstack/tempest testing Neutron with ovn driver and the latest OVN LTS branch + parent: neutron-ovn-base + vars: + devstack_localrc: + OVN_BUILD_FROM_SOURCE: True + OVN_BRANCH: branch-24.03 + OVS_BRANCH: branch-3.3 + - job: name: neutron-ovn-tempest-plugin-ovs-master branches: ^master$ @@ -692,6 +703,17 @@ OVN_BRANCH: main OVS_BRANCH: main +- job: + name: neutron-ovn-tempest-plugin-ovs-lts + branches: ^master$ + description: Job testing Neutron tempest plugin with ovn driver and the latest OVN LTS branch + parent: neutron-tempest-plugin-ovn + vars: + devstack_localrc: + OVN_BUILD_FROM_SOURCE: True + OVN_BRANCH: branch-24.03 + OVS_BRANCH: branch-3.3 + - job: name: neutron-ovn-tempest-ovs-release-with-oslo-master branches: ^master$