From 67f36f0c5c2165df71e980ac7121d9db14487227 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 (cherry picked from commit ca8b40403f7e1ab1f383da01b4a18b066fd35b93) Conflicts: zuul.d/rally.yaml zuul.d/tempest-multinode.yaml zuul.d/tempest-singlenode.yaml --- 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 | 5 +++++ zuul.d/tripleo.yaml | 2 ++ 6 files changed, 15 insertions(+) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 0e52c5f0682..48b9236fd9c 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -26,6 +26,7 @@ - ^playbooks/.*$ - ^roles/.*$ - ^rally-jobs/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: OVN_BRANCH: v20.06.1 # TODO(jlibosva): v2.13.1 is incompatible with kernel 4.15.0-118, sticking to commit hash until new v2.13 tag is created @@ -77,6 +78,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 37015e4d8b0..cd582eac235 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -21,6 +21,7 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml vars: devstack_services: etcd: false @@ -162,6 +163,7 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^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 64ed76ebdb9..6c96b2ad23d 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -50,6 +50,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-ovn-rally-task @@ -84,6 +85,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^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 0ef1c7dd272..fb8423c5e44 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -25,6 +25,7 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml voting: false vars: tox_envlist: integrated-network @@ -217,6 +218,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^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 0dadc945ace..a7d6a120bc9 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -65,6 +65,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-tempest-dvr @@ -100,6 +101,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-tempest-iptables_hybrid @@ -191,6 +193,7 @@ - ^vagrant/.*$ - ^neutron/agent/.*$ - ^neutron/plugins/ml2/drivers/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-tempest-mariadb-full @@ -258,6 +261,7 @@ - ^tools/.*$ - ^tox.ini$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-tempest-with-uwsgi-loki @@ -375,6 +379,7 @@ - ^neutron/plugins/ml2/drivers/macvtap/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/scheduler/.*$ + - ^zuul.d/(?!(project)).*\.yaml - job: name: neutron-tempest-ipv6-only diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml index 17c71d30ce6..345f87661a6 100644 --- a/zuul.d/tripleo.yaml +++ b/zuul.d/tripleo.yaml @@ -33,6 +33,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 @@ -67,3 +68,4 @@ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/scheduler/.*$ - ^vagrant/.*$ + - ^zuul.d/(?!(project)).*\.yaml