From ace1a5fabb6f2ebffc4c0e481b23d0cd2a2aa1b8 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Fri, 15 Jan 2021 10:42:41 +0100
Subject: [PATCH] Add lint dependencies for content provider

If linting fails, content provider still builds.
Whis is suboptimal, since standalone/multinode jobs will be skipped and
nothing will use those builds.

Put cprovider into dependency on the linting jobs as well.

Change-Id: Icdd2c581c8e610eb687042044c2a8f3efee44527
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 9014c68e60d6420c70728304bf77e5c5049f1a72)
---
 zuul.d/layout.yaml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index d9f35b463..a1e6253a1 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -13,7 +13,11 @@
       - tripleo-upgrades-victoria-pipeline
     check:
       jobs:
-        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-8-content-provider:
+            dependencies:
+              - openstack-tox-pep8
+              - openstack-tox-py36
+              - openstack-tox-py38
         - tripleo-ci-centos-8-containers-multinode:
             vars: &multi_consumer_vars
               consumer_job: true
@@ -30,10 +34,7 @@
                 - overcloud-deploy
                 - overcloud-post-deploy
                 - overcloud-validate
-            dependencies: &deps_unit_lint_cprovider
-              - openstack-tox-pep8
-              - openstack-tox-py36
-              - openstack-tox-py38
+            dependencies: &cprovider
               - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-8-standalone:
             vars: &sa_consumer_vars
@@ -41,22 +42,22 @@
               build_container_images: false
               tags:
                 - standalone
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
             vars: *multi_consumer_vars
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-scenario001-standalone:
             vars: *sa_consumer_vars
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-scenario002-standalone:
             vars: *sa_consumer_vars
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-scenario003-standalone:
             vars: *sa_consumer_vars
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-scenario004-standalone:
             vars: *sa_consumer_vars
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
         - tripleo-ci-centos-8-containers-undercloud-minion:
             vars: &undercloud_consumer_vars
               consumer_job: true
@@ -65,7 +66,7 @@
               - undercloud-scripts
               - undercloud-install
               - undercloud-validate
-            dependencies: *deps_unit_lint_cprovider
+            dependencies: *cprovider
             files:
               - ^config-generator/.*minion.*$
               - ^tripleoclient/config/.*minion.*$