From 4afee56afae7aa61479317a8c3927fa6d7bffdfb Mon Sep 17 00:00:00 2001
From: Rafael Folco <rfolco@redhat.com>
Date: Fri, 9 Oct 2020 17:21:02 -0300
Subject: [PATCH] [train] Switch to content provider jobs/templates

This change switches templates and jobs to the content provider
dependency relation so the jobs share the produced artifacts.

Depends-On: https://review.opendev.org/#/c/758214

Change-Id: Ib36094cf9b0cc64723b706c45d4532bf58179302
---
 zuul.d/layout.yaml | 67 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 7b09585d8a..340642aa6f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,26 +1,56 @@
 - project:
     templates:
-      - tripleo-undercloud-jobs
-      - tripleo-multinode-container-minimal
+      - tripleo-undercloud-jobs-pipeline
+      - tripleo-multinode-container-minimal-pipeline
       - check-requirements
       - release-notes-jobs-python3
       - openstack-python-jobs
-      - tripleo-standalone-scenarios-full
+      - tripleo-standalone-scenarios-pipeline
       - openstack-python3-train-jobs
-      - tripleo-standalone-multinode-ipa
+      - tripleo-standalone-multinode-ipa-pipeline
     check:
       jobs:
         - openstack-tox-pep8
         - openstack-tox-lower-constraints
-        - tripleo-ci-centos-7-containers-multinode:
+        - tripleo-ci-centos-8-content-provider:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
+        - tripleo-ci-centos-7-containers-multinode:
+            dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-containers-multinode:
-            dependencies: *deps_unit_lint
+            vars: &multi_consumer_vars
+              consumer_job: true
+              build_container_images: false
+              tags:
+                - undercloud-setup
+                - undercloud-scripts
+                - undercloud-install
+                - undercloud-post-install
+                - tripleo-validations
+                - overcloud-scripts
+                - overcloud-prep-config
+                - overcloud-prep-containers
+                - overcloud-deploy
+                - overcloud-post-deploy
+                - overcloud-validate
+            dependencies: &deps_cprovider
+              - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-8-undercloud-containers:
-            dependencies: *deps_unit_lint
+            vars: &undercloud_consumer_vars
+              consumer_job: true
+              tags:
+              - undercloud-setup
+              - undercloud-scripts
+              - undercloud-install
+              - undercloud-validate
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-8-standalone:
-            dependencies: *deps_unit_lint
+            vars: &sa_consumer_vars
+              consumer_job: true
+              build_container_images: false
+              tags:
+                - standalone
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
             voting: true
             dependencies: *deps_unit_lint
@@ -52,7 +82,8 @@
               - ^network/endpoints/.*$
               - zuul.d/*
         - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            dependencies: *deps_unit_lint
+            vars: *multi_consumer_vars
+            dependencies: *deps_cprovider
             files:
               - ci/environments/scenario007-multinode-containers.yaml
               - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
@@ -64,7 +95,8 @@
               - ^common/.*$
               - zuul.d/*
         - tripleo-ci-centos-8-scenario010-standalone:
-            dependencies: *deps_unit_lint
+            vars: *multi_consumer_vars
+            dependencies: *deps_cprovider
             files:
               - ^(deployment|docker|puppet)/.*octavia.*$
               - ^deployment/ceph-ansible.*$
@@ -79,15 +111,20 @@
         - tripleo-ci-centos-7-standalone-upgrade:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-scenario001-standalone:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-8-scenario002-standalone:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-8-scenario003-standalone:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-8-scenario004-standalone:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-8-scenario012-standalone:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-7-containerized-undercloud-upgrades:
             voting: false
             dependencies: *deps_unit_lint