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

zuul.d/layout.yaml

@@ -6,13 +6,14 @@
     - openstack-python3-ussuri-jobs
     check:
       jobs:
+      - tripleo-ci-centos-8-content-provider
       - openstack-tox-linters
       - openstack-tox-docs: &tripleo-docs
           files:
           - ^doc/.*
           - ^README.rst
-      - tripleo-ci-centos-7-containers-multinode: &containers_multinode
+      - tripleo-ci-centos-7-containers-multinode: &containers_multinode_c7
-          files:
+          files: &multi_files
           - ^tripleo_ansible/.*
           irrelevant-files: &irrelevant_scenario_files
           - .*.md$
@@ -21,8 +22,34 @@
           - ^tripleo_ansible/.*molecule.*
           - ^tripleo_ansible/.*meta.*
           - ^tripleo_ansible/roles/test_deps/.*
-      - tripleo-ci-centos-8-containers-multinode: *containers_multinode
+      - tripleo-ci-centos-8-containers-multinode: &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
+            - openstack-tox-linters
+            - tripleo-ci-centos-8-content-provider
+          files: *multi_files
+          irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-8-scenario001-standalone: &scenario001
+          vars: &sa_consumer_vars
+            consumer_job: true
+            build_container_images: false
+            tags:
+              - standalone
+          dependencies: *deps
           files:
           - ^tripleo_ansible/roles/tripleo-ceph-.*/.*
           - ^tripleo_ansible/roles/tripleo-hieradata/.*
@@ -30,21 +57,29 @@
           - ^setup.*
           irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-8-scenario002-standalone: &scenario002
+          vars: *sa_consumer_vars
+          dependencies: *deps
           files:
           - ^tripleo_ansible/roles/tripleo-hieradata/.*
           - ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
           irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-8-scenario003-standalone: &scenario003
+          vars: *sa_consumer_vars
+          dependencies: *deps
           files:
           - ^tripleo_ansible/roles/tripleo-create-admin/.*
           - ^tripleo_ansible/roles/tripleo-hieradata/.*
           - ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
           irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-8-scenario004-standalone: &scenario004
+          vars: *sa_consumer_vars
+          dependencies: *deps
           files:
           - ^tripleo_ansible/roles/tripleo-ceph-.*/.*
           irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-8-scenario010-standalone: &scenario010
+          vars: *sa_consumer_vars
+          dependencies: *deps
           files:
           - ^tripleo_ansible/.*octavia.*
           irrelevant-files: *irrelevant_scenario_files
@@ -58,8 +93,9 @@
     gate:
       jobs:
       - openstack-tox-linters
+      - tripleo-ci-centos-8-content-provider
       - openstack-tox-docs: *tripleo-docs
-      - tripleo-ci-centos-7-containers-multinode: *containers_multinode
+      - tripleo-ci-centos-7-containers-multinode: *containers_multinode_c7
       - tripleo-ci-centos-8-containers-multinode: *containers_multinode
       - tripleo-ci-centos-8-scenario001-standalone: *scenario001
       - tripleo-ci-centos-8-scenario002-standalone: *scenario002