From 3d21a2b3f2f6a42c06684e773caa8887bc9784c1 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 18 Jan 2016 21:15:07 +0100
Subject: [PATCH] Use linters job for keystonemiddleware starting with mitaka

Merge pep8 and bandit job for mitaka and newer into linters job,
continue using pep8 and bandit for liberty and kilo.

Change-Id: I849cab5461b7b6f483fc5967b50736e0ba30e705
Depends-On: Idff7d7134c50aa4740ed87eeeda83f7cca32f3db
---
 zuul/layout.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 352adb2cd9..3af86c701b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1549,8 +1549,16 @@ jobs:
     branch: ^(?!stable/(kilo|liberty)).*$
     voting: false
 
+    # -linters is used starting with mitaka instead of pep8 and bandit
+    # (bandit is only available in liberty).
+  - name: gate-keystonemiddleware-linters
+    branch: ^(?!stable/(kilo|liberty)).*$
+
+  - name: gate-keystonemiddleware-pep8
+    branch: ^stable/(kilo|liberty).*$
+
   - name: gate-keystonemiddleware-tox-bandit
-    branch: ^(?!stable/kilo).*$
+    branch: ^stable/liberty$
 
   - name: gate-kuryr-requirements
     voting: false
@@ -5904,7 +5912,7 @@ projects:
   - name: openstack/keystonemiddleware
     template:
       - name: merge-check
-      - name: python-jobs
+      - name: python-jobs-linters
       - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
@@ -5913,8 +5921,10 @@ projects:
       - name: release-notes-jobs
     check:
       - gate-keystonemiddleware-tox-bandit
+      - gate-keystonemiddleware-pep8
     gate:
       - gate-keystonemiddleware-tox-bandit
+      - gate-keystonemiddleware-pep8
     post:
       - keystonemiddleware-coverage