From bf9158538881fdc34bc1c4f39a1e77fac76dfdde Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 20 Feb 2019 08:53:05 +0000
Subject: [PATCH] Make build-containers job definition reusable

Allows us to define build-containers-fedora-28 job on rdo that would
inherit the upstream definition.

Base jobs that do have file patterns define should have a
`-base-with-files` suffix instead of just `-base`, so we can avoid
accidental use in periodic jobs.

Adds missing patterns on triple-repos which is used by build-containers
in order to avoid making changes to it that would break these jobs.

Change-Id: Ibd0512f1e9bc9c4acb8c0256d1f161bd6d09fe73
Needed-By: https://review.rdoproject.org/r/#/c/18913/
Related-To: https://storyboard.openstack.org/#!/story/2005040
---
 zuul.d/base.yaml             | 22 ++++++++++++++++++++++
 zuul.d/build-containers.yaml | 17 +----------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 206d999d9..d496fea8c 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -178,3 +178,25 @@
       - git.openstack.org/openstack/tripleo-common
       - git.openstack.org/openstack/tripleo-repos
 
+- job:
+    # Has file filters in order to be used with non-periodic triggers due to:
+    # https://storyboard.openstack.org/#!/story/2005040
+    name: tripleo-build-containers-base-with-files
+    parent: tripleo-build-containers-base
+    abstract: true
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^releasenotes/.*$
+    files:
+      # tripleo-ci
+      - ^(playbooks|roles)/tripleo-buildcontainers/.*$
+      - ^(playbooks|roles)/tripleo-repos/.*$
+      - ^zuul.d/build-containers.yaml$
+      - ^zuul.d/base.yaml$
+      # tripleo-common
+      - ^container-images/.*$
+      - ^tripleo_common/image/.*$
+      # tripleo-repos
+      - ^tripleo_repos/.*$
+      # python-tripleoclient
+      - ^tripleoclient/v1/container.*$
diff --git a/zuul.d/build-containers.yaml b/zuul.d/build-containers.yaml
index 28670e2f7..e110c7982 100644
--- a/zuul.d/build-containers.yaml
+++ b/zuul.d/build-containers.yaml
@@ -12,23 +12,8 @@
       jobs:
         - tripleo-build-containers-centos-7
 
-
 - job:
     name: tripleo-build-containers-centos-7
-    parent: tripleo-build-containers-base
+    parent: tripleo-build-containers-base-with-files
     nodeset: single-centos-7-node
     voting: true
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^releasenotes/.*$
-    files:
-      # tripleo-ci
-      - ^playbooks/tripleo-buildcontainers/.*$
-      - zuul.d/base.yaml
-      - zuul.d/nodesets.yaml
-      - roles/tripleo-repos/.*
-      # tripleo-common
-      - ^container-images/.*$
-      - ^tripleo_common/image/.*$
-      # python-tripleoclient
-      - ^tripleoclient/v1/container.*$