Fix regex lines in zuul.d/* files
Commit260c968118
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 Conflicts: zuul.d/base.yaml zuul.d/job-templates.yaml zuul.d/rally.yaml zuul.d/tempest-multinode.yaml zuul.d/tempest-singlenode.yaml Related-bug: #2065821 Change-Id: I3bba89ac14414c6b7d375072ae92d2e0b5497736 (cherry picked from commit11027e3e1e
) (cherry picked from commit0afdfb0ad5
) (cherry picked from commitaf8d615517
) (cherry picked from commit0b7af2ba53
) (cherry picked from commit049bf273d8
)
This commit is contained in:
parent
ad3b62cae2
commit
19ab990dc2
@ -31,7 +31,13 @@
|
|||||||
- ^playbooks/prepare-ovn-multinode.yaml
|
- ^playbooks/prepare-ovn-multinode.yaml
|
||||||
- ^roles/add_mariadb_repo/.*$
|
- ^roles/add_mariadb_repo/.*$
|
||||||
- ^roles/nftables/.*$
|
- ^roles/nftables/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
@ -93,7 +99,13 @@
|
|||||||
- ^playbooks/prepare-ovn-multinode.yaml
|
- ^playbooks/prepare-ovn-multinode.yaml
|
||||||
- ^roles/add_mariadb_repo/.*$
|
- ^roles/add_mariadb_repo/.*$
|
||||||
- ^roles/nftables/.*$
|
- ^roles/nftables/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
|
@ -31,7 +31,13 @@
|
|||||||
- ^neutron/cmd/ovn/.*$
|
- ^neutron/cmd/ovn/.*$
|
||||||
- ^neutron/common/ovn/.*$
|
- ^neutron/common/ovn/.*$
|
||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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_services:
|
devstack_services:
|
||||||
etcd: false
|
etcd: false
|
||||||
@ -196,7 +202,13 @@
|
|||||||
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
||||||
- ^neutron/scheduler/.*$
|
- ^neutron/scheduler/.*$
|
||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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:
|
||||||
|
@ -18,7 +18,13 @@
|
|||||||
- ^devstack/.*$
|
- ^devstack/.*$
|
||||||
- ^playbooks/.*$
|
- ^playbooks/.*$
|
||||||
- ^roles/.*$
|
- ^roles/.*$
|
||||||
- ^zuul.d/(?!(job-templates)).*\.yaml
|
# Ignore everything except for zuul.d/job-templates.yaml
|
||||||
|
- ^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-py39: # from openstack-python3-yoga-jobs template
|
- openstack-tox-py39: # from openstack-python3-yoga-jobs template
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
irrelevant-files: *irrelevant-files
|
irrelevant-files: *irrelevant-files
|
||||||
@ -83,7 +89,13 @@
|
|||||||
- ^neutron/scheduler/.*$
|
- ^neutron/scheduler/.*$
|
||||||
- ^roles/.*functional.*$
|
- ^roles/.*functional.*$
|
||||||
- ^playbooks/.*functional.*$
|
- ^playbooks/.*functional.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^zuul.d/base.yaml
|
||||||
|
- ^zuul.d/grenade.yaml
|
||||||
|
- ^zuul.d/job-templates.yaml.yaml
|
||||||
|
- ^zuul.d/rally.yaml
|
||||||
|
- ^zuul.d/tempest-multinode.yaml
|
||||||
|
- ^zuul.d/tempest-singlenode.yaml
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: neutron-periodic-jobs
|
name: neutron-periodic-jobs
|
||||||
|
@ -35,7 +35,13 @@
|
|||||||
- ^neutron/cmd/ovn/.*$
|
- ^neutron/cmd/ovn/.*$
|
||||||
- ^neutron/common/ovn/.*$
|
- ^neutron/common/ovn/.*$
|
||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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:
|
||||||
@ -367,7 +373,13 @@
|
|||||||
- ^neutron/services/trunk/drivers/linuxbridge/.*$
|
- ^neutron/services/trunk/drivers/linuxbridge/.*$
|
||||||
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
||||||
- ^neutron/scheduler/.*$
|
- ^neutron/scheduler/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
|
@ -80,7 +80,13 @@
|
|||||||
- ^neutron/services/trunk/drivers/ovn/.*$
|
- ^neutron/services/trunk/drivers/ovn/.*$
|
||||||
- ^neutron/cmd/ovn/.*$
|
- ^neutron/cmd/ovn/.*$
|
||||||
- ^neutron/common/ovn/.*$
|
- ^neutron/common/ovn/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
@ -133,7 +139,13 @@
|
|||||||
- ^neutron/services/trunk/drivers/ovn/.*$
|
- ^neutron/services/trunk/drivers/ovn/.*$
|
||||||
- ^neutron/cmd/ovn/.*$
|
- ^neutron/cmd/ovn/.*$
|
||||||
- ^neutron/common/ovn/.*$
|
- ^neutron/common/ovn/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
|
|
||||||
# TODO(ralonsoh): remove this duplicated definition when "devstack" and "nova"
|
# TODO(ralonsoh): remove this duplicated definition when "devstack" and "nova"
|
||||||
# adopt the new name.
|
# adopt the new name.
|
||||||
@ -238,7 +250,13 @@
|
|||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^neutron/agent/.*$
|
- ^neutron/agent/.*$
|
||||||
- ^neutron/plugins/ml2/drivers/.*$
|
- ^neutron/plugins/ml2/drivers/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
@ -312,7 +330,13 @@
|
|||||||
- ^tools/.*$
|
- ^tools/.*$
|
||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
@ -438,7 +462,13 @@
|
|||||||
- ^neutron/services/trunk/drivers/linuxbridge/.*$
|
- ^neutron/services/trunk/drivers/linuxbridge/.*$
|
||||||
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
- ^neutron/services/trunk/drivers/openvswitch/.*$
|
||||||
- ^neutron/scheduler/.*$
|
- ^neutron/scheduler/.*$
|
||||||
- ^zuul.d/(?!(project)).*\.yaml
|
# Ignore everything except for zuul.d/project.yaml
|
||||||
|
- ^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
|
||||||
|
|
||||||
# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
|
# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
|
||||||
- job:
|
- job:
|
||||||
|
Loading…
Reference in New Issue
Block a user