From ca8b40403f7e1ab1f383da01b4a18b066fd35b93 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Thu, 3 Feb 2022 15:12:52 +0530 Subject: [PATCH] Update irrelevant-files to skip run of untouched jobs Currently when a job config is updated, all other jobs are triggered unnecessary. This patch updates irrelevant files to ignore changes in all job config files except zuul.d/project.yaml(as this contains the list of jobs to run not their definitions). With this only the jobs whose definitions are updated(along with it's child jobs) will be triggered because by default match-on-config-updates is set to true for a job[1] and that ignores files or irrelevant-files for a job inclusion. [1] https://zuul-ci.org/docs/zuul/latest/config/job.html#attr-job.match-on-config-updates Change-Id: Ida7c3ac974058769eb7ff901715e9b17a998bf79 --- zuul.d/base.yaml | 2 ++ zuul.d/grenade.yaml | 2 ++ zuul.d/rally.yaml | 2 ++ zuul.d/tempest-multinode.yaml | 2 ++ zuul.d/tempest-singlenode.yaml | 6 ++++++ zuul.d/tripleo.yaml | 2 ++ 6 files changed, 16 insertions(+) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index fbc682f7afb..d07290be1fc 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -26,6 +26,7 @@ - ^playbooks/.*$ - ^roles/.*$ - ^rally-jobs/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: Q_BUILD_OVS_FROM_GIT: True INSTALL_OVN: True @@ -79,6 +80,7 @@ - ^playbooks/.*$ - ^roles/.*$ - ^rally-jobs/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-fullstack-with-uwsgi diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index c38ee370fdb..9a28a16dd91 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -31,6 +31,7 @@ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: devstack_services: etcd: false @@ -195,6 +196,7 @@ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^neutron/scheduler/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml roles: - zuul: openstack/neutron-tempest-plugin required-projects: diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index 6fc324e6d13..6f9371c1c58 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -77,6 +77,7 @@ - ^neutron/services/trunk/drivers/ovn/.*$ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-rally-task @@ -116,6 +117,7 @@ - ^neutron/services/trunk/drivers/linuxbridge/.*$ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^neutron/scheduler/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: devstack_plugins: neutron: https://opendev.org/openstack/neutron diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 3b9cd95b00b..b055210f683 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -35,6 +35,7 @@ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: tox_envlist: integrated-network devstack_localrc: @@ -291,6 +292,7 @@ - ^neutron/services/trunk/drivers/linuxbridge/.*$ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^neutron/scheduler/.*$ + - ^zuul.d/(?!(project)).*\.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 8bf1828f1e6..caab0b63f3d 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -80,6 +80,7 @@ - ^neutron/services/trunk/drivers/ovn/.*$ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovs-tempest-dvr @@ -132,6 +133,7 @@ - ^neutron/services/trunk/drivers/ovn/.*$ - ^neutron/cmd/ovn/.*$ - ^neutron/common/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml # TODO(ralonsoh): remove this duplicated definition when "devstack" and "nova" # adopt the new name. @@ -236,6 +238,7 @@ - ^vagrant/.*$ - ^neutron/agent/.*$ - ^neutron/plugins/ml2/drivers/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-tempest-mariadb-full @@ -309,6 +312,7 @@ - ^neutron/plugins/ml2/drivers/linuxbridge/.*$ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-tempest-with-neutron-lib-master @@ -383,6 +387,7 @@ - ^tools/.*$ - ^tox.ini$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-tempest-with-uwsgi-loki @@ -505,6 +510,7 @@ - ^neutron/services/trunk/drivers/linuxbridge/.*$ - ^neutron/services/trunk/drivers/openvswitch/.*$ - ^neutron/scheduler/.*$ + - ^zuul.d/(?!(project)).*\.yaml # TODO(slaweq): move this to be multinode job when it will be possible in Zuul - job: diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml index efaa7d89bd7..85eb47141e4 100644 --- a/zuul.d/tripleo.yaml +++ b/zuul.d/tripleo.yaml @@ -35,6 +35,7 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-tripleo-ci-centos-8-containers-multinode @@ -71,3 +72,4 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/scheduler/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml