openstack/neutron
Code Issues Proposed changes

Fix regex lines in zuul.d/* files

Browse Source 
Commit 260c968118 broke the gate by causing jobs
to not get run when it added RE2 compatibility for
irrelevant-files. Digging found that RE2 doesn't
support negative lookahead (and won't ever), so it's
impossible to replace the previous pcre filter with a
similar RE2 filter.

Instead of reverting to the original filter, which
is considered obsolete by zuul, this patch fixes the
issue by explicitly listing all files under zuul.d/
except the one that we actually want to trigger the
jobs: zuul.d/project.yaml.

Listing all the files in the directory for every job
is not ideal, and we may revisit it later, or perhaps
even reconsider the extensive use of irrelevant-files
in the neutron tree. This will have to wait for when
the gate is in better shape though.

[0] https://github.com/google/re2/issues/156

Related-bug: #2065821
Change-Id: I3bba89ac14414c6b7d375072ae92d2e0b5497736
This commit is contained in:
Brian Haley 2024-06-04 12:23:27 -04:00 committed by yatinkarel
parent eaca8a360f
commit 11027e3e1e
7 changed files with 112 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zuul.d/base.yaml
View File

@ -35,8 +35,13 @@
- ^roles/add_mariadb_repo/.*$ - ^roles/add_mariadb_repo/.*$
- ^roles/nftables/.*$ - ^roles/nftables/.*$
- ^rally-jobs/.*$ - ^rally-jobs/.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
vars: vars:
configure_swap_size: 8192 configure_swap_size: 8192
Q_BUILD_OVS_FROM_GIT: True Q_BUILD_OVS_FROM_GIT: True
@ -100,8 +105,13 @@
- ^roles/add_mariadb_repo/.*$ - ^roles/add_mariadb_repo/.*$
- ^roles/nftables/.*$ - ^roles/nftables/.*$
- ^rally-jobs/.*$ - ^rally-jobs/.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-fullstack-with-uwsgi name: neutron-fullstack-with-uwsgi

18
zuul.d/grenade.yaml
View File

@ -35,8 +35,13 @@
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- ^vagrant/.*$ - ^vagrant/.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
vars: vars:
grenade_devstack_localrc: grenade_devstack_localrc:
shared: shared:
@ -252,8 +257,13 @@
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- ^vagrant/.*$ - ^vagrant/.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
roles: roles:
- zuul: openstack/neutron-tempest-plugin - zuul: openstack/neutron-tempest-plugin
required-projects: required-projects:

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

@ -22,8 +22,13 @@
- ^playbooks/.*$ - ^playbooks/.*$
- ^roles/.*$ - ^roles/.*$
- ^rally-jobs/.*$ - ^rally-jobs/.*$
- regex: ^zuul.d/job-templates.yaml # Ignore everything except for zuul.d/job-templates.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/project.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- openstack-tox-py311: # from openstack-python3-jobs template - openstack-tox-py311: # from openstack-python3-jobs template
timeout: 3600 timeout: 3600
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files

9
zuul.d/project.yaml
View File

@ -61,8 +61,13 @@
- ^neutron/scheduler/.*$ - ^neutron/scheduler/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
gate: gate:
jobs: jobs:

18
zuul.d/rally.yaml
View File

@ -81,8 +81,13 @@
- ^neutron/common/ovn/.*$ - ^neutron/common/ovn/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovn-rally-task name: neutron-ovn-rally-task
@ -126,8 +131,13 @@
- ^neutron/scheduler/.*$ - ^neutron/scheduler/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
vars: vars:
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron neutron: https://opendev.org/openstack/neutron

18
zuul.d/tempest-multinode.yaml
View File

@ -74,8 +74,13 @@
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- ^vagrant/.*$ - ^vagrant/.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc: devstack_localrc:
@ -405,8 +410,13 @@
- ^neutron/scheduler/.*$ - ^neutron/scheduler/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
roles: roles:
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
- zuul: openstack/neutron-tempest-plugin - zuul: openstack/neutron-tempest-plugin

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

@ -88,8 +88,13 @@
- ^neutron/common/ovn/.*$ - ^neutron/common/ovn/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovs-tempest-dvr name: neutron-ovs-tempest-dvr
@ -152,8 +157,13 @@
- ^neutron/common/ovn/.*$ - ^neutron/common/ovn/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovs-tempest-iptables_hybrid name: neutron-ovs-tempest-iptables_hybrid
@ -262,8 +272,13 @@
- ^neutron/plugins/ml2/drivers/.*$ - ^neutron/plugins/ml2/drivers/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovn-tempest-mariadb-full name: neutron-ovn-tempest-mariadb-full
@ -350,8 +365,13 @@
- ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovn-tempest-with-neutron-lib-master name: neutron-ovn-tempest-with-neutron-lib-master
@ -488,8 +508,13 @@
- ^vagrant/.*$ - ^vagrant/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovn-tempest-with-uwsgi-loki name: neutron-ovn-tempest-with-uwsgi-loki
@ -631,8 +656,13 @@
- ^neutron/scheduler/.*$ - ^neutron/scheduler/.*$
- ^roles/.*functional.*$ - ^roles/.*functional.*$
- ^playbooks/.*functional.*$ - ^playbooks/.*functional.*$
- regex: ^zuul.d/project.*\.yaml # Ignore everything except for zuul.d/project.yaml
negate: true - ^zuul.d/base.yaml
- ^zuul.d/grenade.yaml
- ^zuul.d/job-templates.yaml
- ^zuul.d/rally.yaml
- ^zuul.d/tempest-multinode.yaml
- ^zuul.d/tempest-singlenode.yaml
- job: - job:
name: neutron-ovn-tempest-ovs-release name: neutron-ovn-tempest-ovs-release