Merge "[train] Switch to content provider jobs/templates" into stable/train

zuul.d/layout.yaml

@@ -10,9 +10,9 @@
       - release-notes-jobs-python3
       - tripleo-buildimage-jobs
       - tripleo-build-containers-jobs
-      - tripleo-multinode-container-minimal
+      - tripleo-multinode-container-minimal-pipeline
-      - tripleo-undercloud-jobs
+      - tripleo-undercloud-jobs-pipeline
-      - tripleo-standalone-scenarios-full
+      - tripleo-standalone-scenarios-pipeline
     check:
       jobs:
         - openstack-tox-pep8
@@ -20,11 +20,29 @@
             voting: false
         - openstack-tox-py36
         - openstack-tox-py37
-        - tripleo-ci-centos-8-containers-multinode:
+        - tripleo-ci-centos-8-content-provider:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
               - openstack-tox-py36
               - openstack-tox-py37
+        - tripleo-ci-centos-8-containers-multinode:
+            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-build-containers-ubi-8:
             dependencies: *deps_unit_lint
             files:
@@ -34,21 +52,32 @@
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            dependencies: *deps_unit_lint
+            vars: *multi_consumer_vars
+            dependencies: *deps_cprovider
         - tripleo-ci-centos-7-standalone-upgrade:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-scenario001-standalone:
-            dependencies: *deps_unit_lint
+            vars: &sa_consumer_vars
+              consumer_job: true
+              build_container_images: false
+              tags:
+                - standalone
+            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-8-containers-undercloud-minion:
-            dependencies: *deps_unit_lint
+            vars: *sa_consumer_vars
+            dependencies: *deps_cprovider
             files:
               - ^config-generator/.*minion.*$
               - ^tripleoclient/config/.*minion.*$