commit 5ff1dc024300d606faf9a01d8233cd59f08ec854
Author: Sorin Sbarnea <ssbarnea@redhat.com>
Date:   Fri Oct 16 13:58:24 2020 +0100

    Correct irrelevant-files for upgrades
    
    Fixes bug which made upgrade job loose their original
    ignore list.
    
    Change-Id: Ic5418a82df9cd03ab9e6135691492412c62449e9

diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml
index 3b138e9..5a774b2 100644
--- a/zuul.d/standalone-jobs.yaml
+++ b/zuul.d/standalone-jobs.yaml
@@ -3,6 +3,10 @@
 # Zuul layout for TripleO standalone jobs.
 # It contains all the jobs related to standalone installer testing.
 
+# ATTENTION: Try to avoid adding irrelevant-files inside templates
+# or project because it does override values defined at job level.
+# An attempt to optimize at this level can have the exactly opposite effect,
+# triggering the affected jobs on far more changes than needed.
 - job:
     name: tripleo-ci-centos-7-standalone
     parent: tripleo-ci-base-standalone
@@ -103,6 +107,11 @@
       - ^Puppetfile.*$
       - tox.ini
       - ^vars/sova-patterns.yml$
+      - zuul.d/build-containers.yaml
+      - zuul.d/build-image.yaml
+      - zuul.d/multinode-jobs.yaml
+      - zuul.d/undercloud-jobs.yaml
+      - zuul.d/ansible.yaml
       # like parent but with requirements.txt and setup.py removed
 
 - job:
@@ -423,15 +432,8 @@
               # puppet-tripleo
               - ^manifests/haproxy.*$
         - tripleo-ci-centos-7-standalone-rocky
-        - tripleo-ci-centos-8-standalone-upgrade:
-            irrelevant-files: &sa_upgrade_ignore
-              - zuul.d/build-containers.yaml
-              - zuul.d/build-image.yaml
-              - zuul.d/multinode-jobs.yaml
-              - zuul.d/undercloud-jobs.yaml
-              - zuul.d/ansible.yaml
-        - tripleo-ci-centos-8-standalone-upgrade-ussuri:
-            irrelevant-files: *sa_upgrade_ignore
+        - tripleo-ci-centos-8-standalone-upgrade
+        - tripleo-ci-centos-8-standalone-upgrade-ussuri
         - tripleo-ci-centos-7-standalone-upgrade-stein
         - tripleo-ci-centos-7-standalone-upgrade-train
         - tripleo-ci-centos-8-standalone
@@ -544,10 +546,8 @@
         - tripleo-ci-centos-7-scenario010-ovn-provider-standalone:
             files: *scen10_files
         - tripleo-ci-centos-7-standalone-rocky
-        - tripleo-ci-centos-8-standalone-upgrade:
-            irrelevant-files: *sa_upgrade_ignore
-        - tripleo-ci-centos-8-standalone-upgrade-ussuri:
-            irrelevant-files: *sa_upgrade_ignore
+        - tripleo-ci-centos-8-standalone-upgrade
+        - tripleo-ci-centos-8-standalone-upgrade-ussuri
         - tripleo-ci-centos-7-standalone-upgrade-stein
         - tripleo-ci-centos-7-standalone-upgrade-train
         - tripleo-ci-centos-7-standalone