diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index f06cc5e3717..e3124039af2 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -31,7 +31,13 @@ - ^playbooks/prepare-ovn-multinode.yaml - ^roles/add_mariadb_repo/.*$ - ^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: configure_swap_size: 8192 Q_BUILD_OVS_FROM_GIT: True @@ -93,7 +99,13 @@ - ^playbooks/prepare-ovn-multinode.yaml - ^roles/add_mariadb_repo/.*$ - ^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: name: neutron-fullstack-with-uwsgi diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 9a28a16dd91..f4d82758f35 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -31,7 +31,13 @@ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ - ^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: devstack_services: etcd: false @@ -196,7 +202,13 @@ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^neutron/scheduler/.*$ - ^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: - zuul: openstack/neutron-tempest-plugin required-projects: diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index aad00ff6572..542b1aafd47 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -18,7 +18,13 @@ - ^devstack/.*$ - ^playbooks/.*$ - ^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 timeout: 3600 irrelevant-files: *irrelevant-files @@ -83,7 +89,13 @@ - ^neutron/scheduler/.*$ - ^roles/.*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: name: neutron-periodic-jobs diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index a773663d001..59872ab7804 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -35,7 +35,13 @@ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ - ^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: tox_envlist: integrated-network devstack_localrc: @@ -367,7 +373,13 @@ - ^neutron/services/trunk/drivers/linuxbridge/.*$ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^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: - zuul: zuul/zuul-jobs - zuul: openstack/neutron-tempest-plugin diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index f60ecf46c6d..bf58ac8236c 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -80,7 +80,13 @@ - ^neutron/services/trunk/drivers/ovn/.*$ - ^neutron/cmd/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: name: neutron-ovs-tempest-dvr @@ -133,7 +139,13 @@ - ^neutron/services/trunk/drivers/ovn/.*$ - ^neutron/cmd/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" # adopt the new name. @@ -238,7 +250,13 @@ - ^vagrant/.*$ - ^neutron/agent/.*$ - ^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: name: neutron-ovn-tempest-mariadb-full @@ -312,7 +330,13 @@ - ^tools/.*$ - ^tox.ini$ - ^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: name: neutron-ovn-tempest-with-uwsgi-loki @@ -438,7 +462,13 @@ - ^neutron/services/trunk/drivers/linuxbridge/.*$ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^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 - job: