[stable/2024.1 only] Drop -master jobs

Similar to previous stable branches, drop these
jobs as they only make sense for master branch.

Change-Id: I81dde474be6027cd8548dcbfcd7b3f74cf3e00c2
This commit is contained in:
yatinkarel 2024-07-30 17:32:46 +05:30
parent 1f761c27f2
commit 41f0e9ad04
5 changed files with 0 additions and 418 deletions

@ -125,21 +125,6 @@ Currently we have in that queue jobs like listed below.
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-full-multinode-ovs-master |Various tempest api, scenario | 2 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No |
| |and neutron_tempest_plugi tests | | | | | | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-ovs-master |Various tempest api, scenario | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No |
| |and neutron_tempest_plugi 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 | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovn-tempest-ipv6-only-ovs-master |tempest.api (without slow tests) | 1 | Ubuntu Jammy | ovn | ovn | --- | False | False | True | Yes |
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
And we also have Grenade jobs in the experimental queue.
::

@ -115,20 +115,6 @@
# stadium projects where they need to use stadium project as working dir.
zuul_work_dir: src/opendev.org/openstack/neutron
- job:
name: neutron-fullstack-with-uwsgi-with-neutron-lib-master
branches: ^master$
parent: neutron-fullstack-with-uwsgi
required-projects:
- openstack/neutron-lib
- job:
name: neutron-fullstack-with-pyroute2-master
branches: ^master$
parent: neutron-fullstack
required-projects:
- name: github.com/svinota/pyroute2
- job:
name: neutron-functional-with-uwsgi
parent: neutron-functional
@ -142,13 +128,6 @@
# stadium projects where they need to use stadium project as working dir.
zuul_work_dir: src/opendev.org/openstack/neutron
- job:
name: neutron-functional-with-uwsgi-with-neutron-lib-master
branches: ^master$
parent: neutron-functional-with-uwsgi
required-projects:
- openstack/neutron-lib
- job:
name: neutron-functional-with-uwsgi-fips
parent: neutron-functional-with-uwsgi
@ -162,78 +141,6 @@
ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
Q_BUILD_OVS_FROM_GIT: true
- job:
name: neutron-functional-with-pyroute2-master
branches: ^master$
parent: neutron-functional
required-projects:
- name: github.com/svinota/pyroute2
- job:
name: neutron-functional-with-oslo-master
branches: ^master$
parent: neutron-functional
description: |
This job installs all oslo libraries from source and executes the
Neutron functional tests.
# NOTE(ralonsoh): the list of required projects is retrieved from
# "openstack-tox-with-oslo-master-base" job.
# TODO(ralonsoh): push a patch to "openstack-zuul-jobs" to create
# a list reference of the required projects for "-oslo-master" jobs.
required-projects:
- openstack/automaton
- openstack/debtcollector
- openstack/futurist
- openstack/osprofiler
- openstack/oslo.cache
- openstack/oslo.concurrency
- openstack/oslo.config
- openstack/oslo.context
- openstack/oslo.db
- openstack/oslo.i18n
- openstack/oslo.log
- openstack/oslo.messaging
- openstack/oslo.middleware
- openstack/oslo.policy
- openstack/oslo.privsep
- openstack/oslo.reports
- openstack/oslo.rootwrap
- openstack/oslo.serialization
- openstack/oslo.service
- openstack/oslo.utils
- openstack/oslo.versionedobjects
- openstack/oslo.vmware
- openstack/oslotest
- openstack/pycadf
- openstack/stevedore
- openstack/taskflow
- openstack/tooz
- openstack/pbr
- job:
name: neutron-functional-with-sqlalchemy-master
branches: ^master$
parent: neutron-functional
required-projects:
- name: github.com/sqlalchemy/sqlalchemy
override-checkout: main
- openstack/oslo.db
- openstack/neutron-lib
- name: github.com/sqlalchemy/alembic
override-checkout: main
- job:
name: openstack-tox-py311-with-sqlalchemy-master
branches: ^master$
parent: openstack-tox-py311
required-projects:
- name: github.com/sqlalchemy/sqlalchemy
override-checkout: main
- openstack/oslo.db
- openstack/neutron-lib
- name: github.com/sqlalchemy/alembic
override-checkout: main
- job:
name: neutron-fullstack-with-uwsgi-fips
parent: neutron-fullstack-with-uwsgi

@ -29,9 +29,6 @@
- openstack-tox-cover: # from openstack-cover-jobs template
timeout: 4800
irrelevant-files: *irrelevant-files
- openstack-tox-py311-with-sqlalchemy-master:
timeout: 3600
irrelevant-files: *irrelevant-files
check-arm64:
jobs:
- openstack-tox-py38-arm64: # from openstack-python3-jobs-arm64 template
@ -64,13 +61,8 @@
name: neutron-experimental-jobs
experimental:
jobs:
- 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-grenade-multinode
- neutron-ovn-tempest-ovs-master
- neutron-ovn-tempest-ovs-release
- neutron-ovs-tempest-with-neutron-lib-master
- neutron-ovn-tempest-with-uwsgi-loki
# Jobs added to the periodic queue by templates defined in
# https://opendev.org/openstack/openstack-zuul-jobs/src/branch/master/zuul.d/project-templates.yaml
@ -90,21 +82,12 @@
jobs: &neutron-periodic-jobs
- neutron-functional
- neutron-functional-with-uwsgi-fips
- neutron-functional-with-pyroute2-master
- neutron-functional-with-sqlalchemy-master
- neutron-fullstack
- neutron-fullstack-with-uwsgi-fips
- neutron-fullstack-with-pyroute2-master
- neutron-ovs-tempest-slow
- neutron-ovn-tempest-slow
- neutron-ovs-tempest-with-os-ken-master
- neutron-ovn-tempest-postgres-full
- neutron-ovn-tempest-mariadb-full
- neutron-ovn-tempest-ipv6-only-ovs-master
- neutron-ovn-tempest-ovs-master-centos-9-stream
- neutron-ovn-tempest-with-neutron-lib-master
- neutron-ovn-tempest-with-sqlalchemy-master
- neutron-ovs-tempest-with-sqlalchemy-master
- neutron-ovs-tempest-fips
- neutron-ovn-tempest-ovs-release-fips
- devstack-tobiko-neutron:
@ -117,9 +100,6 @@
- openstack-tox-py39-with-oslo-master:
timeout: 3600
irrelevant-files: *irrelevant-files
- neutron-functional-with-oslo-master
- neutron-ovs-tempest-with-oslo-master
- neutron-ovn-tempest-ovs-release-with-oslo-master
- neutron-tempest-plugin-linuxbridge
experimental:
jobs: *neutron-periodic-jobs

@ -523,59 +523,3 @@
vars:
tox_envlist: slow-serial
tempest_test_regex: ""
- job:
# TODO(slaweq): propose job with ovs-release and move -master one to
# experimental queue
name: neutron-ovn-tempest-full-multinode-ovs-master
branches: ^master$
parent: neutron-ovn-multinode-base
run: playbooks/multinode-devstack-custom.yaml
vars:
tox_envlist: all
tempest_test_regex: "^(?!.*\
(?:.*\\[.*slow.*\\])|\
(?:tempest.api.network.admin.test_quotas.QuotasTest.test_lbaas_quotas.*)|\
(?:tempest.api.network.test_load_balancer.*)|\
(?:tempest.scenario.test_load_balancer.*)|\
(?:tempest.api.network.admin.test_load_balancer.*)|\
(?:tempest.api.network.admin.test_lbaas.*)|\
(?:tempest.api.network.test_fwaas_extensions.*)|\
(?:tempest.api.network.test_metering_extensions.*)|\
(?:tempest.thirdparty.boto.test_s3.*)|\
(?:tempest.api.identity*)|\
(?:tempest.api.image*)|\
(?:tempest.api.volume*)|\
(?:tempest.api.compute.images*)|\
(?:tempest.api.compute.keypairs*)|\
(?:tempest.api.compute.certificates*)|\
(?:tempest.api.compute.flavors*)|\
(?:tempest.api.compute.test_quotas*)|\
(?:tempest.api.compute.test_versions*)|\
(?:tempest.api.compute.volumes*)|\
(?:tempest.api.compute.admin.test_flavor*)|\
(?:tempest.api.compute.admin.test_volume*)|\
(?:tempest.api.compute.admin.test_hypervisor*)|\
(?:tempest.api.compute.admin.test_aggregate*)|\
(?:tempest.api.compute.admin.test_quota*)|\
(?:tempest.scenario.test_volume*))\
((^neutron_tempest_plugin.api)|\
(^neutron_tempest_plugin.scenario)|\
(tempest.(api|scenario|thirdparty))).*$"
zuul_copy_output:
'{{ devstack_base_dir }}/data/ovs': 'logs'
'{{ devstack_base_dir }}/data/ovn': 'logs'
'{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
'{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.3
group-vars:
subnode:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.3

@ -293,130 +293,6 @@
pre-run: playbooks/add_mariadb_repo.yaml
irrelevant-files: *tempest-db-irrelevant-files
- job:
name: neutron-ovs-tempest-with-os-ken-master
branches: ^master$
parent: neutron-ovs-tempest-base
timeout: 10800
required-projects:
- openstack/neutron
- openstack/tempest
- openstack/os-ken
vars:
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
irrelevant-files:
- ^\.pylintrc$
- ^test-requirements.txt$
- ^.*\.conf\.sample$
- ^.*\.rst$
- ^doc/.*$
- ^neutron/locale/.*$
- ^neutron/tests/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
- ^tox.ini$
- ^plugin.spec$
- ^tools/ovn_migration/.*$
- ^vagrant/.*$
- ^neutron/agent/windows/.*$
- ^neutron/plugins/ml2/drivers/linuxbridge/.*$
- ^neutron/plugins/ml2/drivers/macvtap/.*$
- ^neutron/plugins/ml2/drivers/mech_sriov/.*$
- ^roles/.*functional.*$
- ^playbooks/.*functional.*$
- ^zuul.d/(?!(project)).*\.yaml
- job:
name: neutron-ovn-tempest-with-neutron-lib-master
branches: ^master$
parent: tempest-integrated-networking
timeout: 10800
required-projects:
- openstack/neutron
- openstack/tempest
- openstack/neutron-lib
vars:
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'
- job:
name: neutron-ovs-tempest-with-neutron-lib-master
branches: ^master$
parent: neutron-ovs-tempest-base
required-projects:
- openstack/neutron-lib
- job:
name: neutron-ovs-tempest-with-oslo-master
branches: ^master$
parent: neutron-ovs-tempest-base
description: |
Job testing for devstack/tempest testing Neutron with OVS driver.
This job installs all oslo libraries from source.
required-projects:
- openstack/automaton
- openstack/debtcollector
- openstack/futurist
- openstack/osprofiler
- openstack/oslo.cache
- openstack/oslo.concurrency
- openstack/oslo.config
- openstack/oslo.context
- openstack/oslo.db
- openstack/oslo.i18n
- openstack/oslo.log
- openstack/oslo.messaging
- openstack/oslo.middleware
- openstack/oslo.policy
- openstack/oslo.privsep
- openstack/oslo.reports
- openstack/oslo.rootwrap
- openstack/oslo.serialization
- openstack/oslo.service
- openstack/oslo.utils
- openstack/oslo.versionedobjects
- openstack/oslo.vmware
- openstack/oslotest
- openstack/pycadf
- openstack/stevedore
- openstack/taskflow
- openstack/tooz
- openstack/pbr
- job:
name: neutron-ovn-tempest-with-uwsgi
parent: tempest-integrated-networking
@ -620,57 +496,6 @@
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
parent: neutron-ovn-base
- job:
name: neutron-ovn-tempest-ovs-master
branches: ^master$
description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch
parent: neutron-ovn-base
vars:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.3
- job:
name: neutron-ovn-tempest-ovs-release-with-oslo-master
branches: ^master$
description: |
Job testing for devstack/tempest testing Neutron with OVN driver.
This job installs all oslo libraries from source.
parent: neutron-ovn-tempest-ovs-release
required-projects:
- openstack/neutron
- openstack/tempest
- openstack/automaton
- openstack/debtcollector
- openstack/futurist
- openstack/osprofiler
- openstack/oslo.cache
- openstack/oslo.concurrency
- openstack/oslo.config
- openstack/oslo.context
- openstack/oslo.db
- openstack/oslo.i18n
- openstack/oslo.log
- openstack/oslo.messaging
- openstack/oslo.middleware
- openstack/oslo.policy
- openstack/oslo.privsep
- openstack/oslo.reports
- openstack/oslo.rootwrap
- openstack/oslo.serialization
- openstack/oslo.service
- openstack/oslo.utils
- openstack/oslo.versionedobjects
- openstack/oslo.vmware
- openstack/oslotest
- openstack/pycadf
- openstack/stevedore
- openstack/taskflow
- openstack/tooz
- openstack/pbr
- job:
name: neutron-ovn-tempest-ovs-master-centos-9-stream
description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch and CentOS 9-Stream
@ -769,62 +594,3 @@
(test_update_router_admin_state)|\
(test_dhcp_stateful_router)|\
(TestSecurityGroupsBasicOps)"
- job:
name: neutron-ovn-tempest-ipv6-only-ovs-master
branches: ^master$
parent: neutron-ovn-tempest-ipv6-only-base
vars:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "main"
# NOTE(ykarel): OVN main branch following OVS stable branch
OVS_BRANCH: branch-3.3
- job:
name: neutron-ovn-tempest-with-sqlalchemy-master
branches: ^master$
parent: tempest-integrated-networking
timeout: 10800
required-projects:
- openstack/neutron
- openstack/tempest
- openstack/oslo.db
- openstack/neutron-lib
- name: github.com/sqlalchemy/sqlalchemy
override-checkout: main
- name: github.com/sqlalchemy/alembic
override-checkout: main
vars:
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'
- job:
name: neutron-ovs-tempest-with-sqlalchemy-master
branches: ^master$
parent: neutron-ovs-tempest-base
required-projects:
- name: github.com/sqlalchemy/sqlalchemy
override-checkout: main
- openstack/oslo.db
- openstack/neutron-lib
- name: github.com/sqlalchemy/alembic
override-checkout: main