commit 58516c07d4226f0ba65f4b60e3b99e79be67c676
Author: Sagi Shnaidman <sshnaidm@redhat.com>
Date:   Mon Oct 5 19:29:01 2020 +0300

    Add content provider for undercloud templates
    
    Create new template for undercloud jobs and a new layer
    to parent off undercloud jobs that use content ptovider.
    
    tripleo-ci-centos-8-undercloud-containers job bootstrap:
    https://review.rdoproject.org/r/#/c/29894/
    
    Co-Authored-By: Rafael Folco <rfolco@redhat.com>
    
    Change-Id: I6b895ef44d5cd3491122089b3ff2a65338e60f08

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 1cabc98..74573d1 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -310,6 +310,14 @@
         - images
 
 - job:
+    name: tripleo-ci-undercloud-content-consumer-centos-8
+    abstract: true
+    description: |
+        Intermediate layer for content consumer undercloud jobs
+    pre-run: playbooks/tripleo-ci/install-built-repo.yml
+    parent: tripleo-ci-base-singlenode-centos-8
+
+- job:
     name: tripleo-ci-base-standalone
     abstract: true
     description: |
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index f7bdcea..25a2037 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -12,7 +12,7 @@
       - tripleo-multinode-container-full-pipeline
       - tripleo-multinode-experimental
       - tripleo-standalone-scenarios-pipeline
-      - tripleo-undercloud-jobs
+      - tripleo-undercloud-jobs-pipeline
       - tripleo-periodic
     check:
       jobs:
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index 89f0a6a..7cf92f4 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -58,6 +58,53 @@
         - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
             irrelevant-files: *undercloud_ignored
 
+- project-template:
+    name: tripleo-undercloud-jobs-pipeline
+    check:
+      jobs:
+        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-8-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+            vars: &undercloud_consumer_vars
+              consumer_job: true
+              tags:
+              - undercloud-setup
+              - undercloud-scripts
+              - undercloud-install
+              - undercloud-validate
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-7-undercloud-oooq:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-undercloud-upgrades:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-containerized-undercloud-upgrades:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-upgrade:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
+            irrelevant-files: *undercloud_ignored
+    gate:
+      queue: tripleo
+      jobs:
+        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-8-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+            vars: *undercloud_consumer_vars
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-7-undercloud-oooq:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-containers-undercloud-minion:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
+            irrelevant-files: *undercloud_ignored
+
+
 - job:
     name: tripleo-ci-centos-7-undercloud-containers
     parent: tripleo-ci-base-singlenode
@@ -68,7 +115,7 @@
 
 - job:
     name: tripleo-ci-centos-8-undercloud-containers
-    parent: tripleo-ci-base-singlenode-centos-8
+    parent: tripleo-ci-undercloud-content-consumer-centos-8
     branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
     voting: true
     vars: