From 28ff2a934c26054a56579ed9dd06aa8063abd8b0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 5 Apr 2021 15:32:41 +0900
Subject: [PATCH] Skip content provider job for irrelevant files

Currently content provider job is not skipped even when tripleo job is
skipped, but this is uselesss.
This change ensures that we rely on the same list of irrelevant files
so that the content provider job is skipped when tripleo job is
skipped.

Change-Id: Iee924f673e3c006606071916c906597cbd891962
(cherry picked from commit cabac611610011a70307f8e96e49fc3bd248b823)
---
 zuul.d/tripleo.yaml | 79 ++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 44 deletions(-)

diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml
index b14d17173..f9aeb12b7 100644
--- a/zuul.d/tripleo.yaml
+++ b/zuul.d/tripleo.yaml
@@ -4,46 +4,7 @@
 - job:
     name: tripleo-puppet-ci-centos-8-undercloud-containers
     parent: tripleo-ci-centos-8-undercloud-containers
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitreview$
-      - ^.gitignore$
-      - ^setup.cfg$
-      - ^setup.py$
-      - ^tox.ini$
-
-- project-template:
-    name: tripleo-puppet-undercloud
-    check:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-puppet-ci-centos-8-undercloud-containers:
-            vars: &undercloud_consumer_vars
-              consumer_job: true
-              remove_tags:
-                - build
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-    gate:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-puppet-ci-centos-8-undercloud-containers:
-            vars: *undercloud_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-
-- job:
-    name: tripleo-puppet-ci-centos-8-standalone
-    parent: tripleo-ci-centos-8-standalone
-    irrelevant-files:
+    irrelevant-files: &irrelevant_files
       - ^.*\.md$
       - ^.*\.rst$
       - ^doc/.*$
@@ -59,6 +20,36 @@
       - ^setup.cfg$
       - ^setup.py$
       - ^tox.ini$
+
+- job:
+    name: tripleo-puppet-ci-centos-8-content-provider
+    parent: tripleo-ci-centos-8-content-provider
+    irrelevant-files: *irrelevant_files
+
+- project-template:
+    name: tripleo-puppet-undercloud
+    check:
+      jobs:
+        - tripleo-puppet-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-undercloud-containers:
+            vars: &undercloud_consumer_vars
+              consumer_job: true
+              remove_tags:
+                - build
+            dependencies:
+              - tripleo-puppet-ci-centos-8-content-provider
+    gate:
+      jobs:
+        - tripleo-puppet-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-undercloud-containers:
+            vars: *undercloud_consumer_vars
+            dependencies:
+              - tripleo-puppet-ci-centos-8-content-provider
+
+- job:
+    name: tripleo-puppet-ci-centos-8-standalone
+    parent: tripleo-ci-centos-8-standalone
+    irrelevant-files: *irrelevant_files
     vars:
       featureset_override:
         standalone_environment_files:
@@ -68,7 +59,7 @@
     name: tripleo-puppet-standalone
     check:
       jobs:
-        - tripleo-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-content-provider
         - tripleo-puppet-ci-centos-8-standalone:
             vars: &standalone_consumer_vars
               consumer_job: true
@@ -76,11 +67,11 @@
               remove_tags:
                 - build
             dependencies:
-              - tripleo-ci-centos-8-content-provider
+              - tripleo-puppet-ci-centos-8-content-provider
     gate:
       jobs:
-        - tripleo-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-content-provider
         - tripleo-puppet-ci-centos-8-standalone:
             vars: *standalone_consumer_vars
             dependencies:
-              - tripleo-ci-centos-8-content-provider
+              - tripleo-puppet-ci-centos-8-content-provider