Merge "Replace bashate/pep8 in project-config by linters"

jenkins/jobs/macros.yaml

@@ -173,6 +173,12 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh"
 
+- builder:
+    name: linters
+    builders:
+      - tox:
+          envlist: linters
+
 - builder:
     name: bashate
     builders:

jenkins/jobs/misc.yaml

@@ -24,6 +24,22 @@
 
     node: '{node}'
 
+- job-template:
+    name: 'gate-{name}-linters'
+    description: General target to run all lint like jobs
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - revoke-sudo
+      - gerrit-git-prep
+      - linters
+
+    publishers:
+      - console-log
+
+    node: '{node}'
+
 - job-template:
     name: 'gate-{name}-bashate'
 

jenkins/jobs/projects.yaml

@@ -4481,8 +4481,7 @@
     node: bare-trusty
 
     jobs:
-      - gate-{name}-pep8
+      - gate-{name}-linters
-      - gate-{name}-bashate
       - generate-specs-site-jobs
       - gate-bindep-fallback-{node}:
           node:

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8,gerrit,grafyaml,projects,jjb,jenkins-project,zuul
+envlist = linters,gerrit,grafyaml,projects,jjb,jenkins-project,zuul
 skipsdist = True
 
 [testenv]
@@ -13,6 +13,11 @@ commands = {toxinidir}/tools/run-bashate.sh
 commands =
   flake8
 
+[testenv:linters]
+commands =
+  {toxinidir}/tools/run-bashate.sh
+  flake8
+
 [testenv:gerrit]
 commands =
   {toxinidir}/tools/check_valid_gerrit_config.sh gerrit/acls/

zuul/layout.yaml

@@ -1275,12 +1275,6 @@ jobs:
   - name: gate-bashate-devstack
     voting: false
 
-  - name: gate-project-config-bashate
-    files:
-      - '^.*\.sh$'
-      - 'test-requirements.txt'
-      - 'tox.ini'
-
   - name: gate-project-config-irc-access
     files:
       - 'accessbot/channels.yaml'
@@ -1296,8 +1290,9 @@ jobs:
       - 'tools/jenkins-projects-checks.py'
       - 'tox.ini'
 
-  - name: gate-project-config-pep8
+  - name: gate-project-config-linters
     files:
+      - '^.*\.sh$'
       - '^.*\.py$'
       - 'test-requirements.txt'
       - 'tox.ini'
@@ -2713,8 +2708,7 @@ projects:
       - gate-project-config-gerrit
       - gate-project-config-grafyaml
       - gate-project-config-layout
-      - gate-project-config-pep8
+      - gate-project-config-linters
-      - gate-project-config-bashate
       - gate-project-config-irc-access
       - gate-project-config-jenkins-project
       - gate-project-config-nodepool
@@ -2726,8 +2720,7 @@ projects:
       - gate-project-config-gerrit
       - gate-project-config-grafyaml
       - gate-project-config-layout
-      - gate-project-config-pep8
+      - gate-project-config-linters
-      - gate-project-config-bashate
       - gate-project-config-irc-access
       - gate-project-config-nodepool
       - gate-project-config-jenkins-project
@@ -2747,11 +2740,11 @@ projects:
     check:
       - gate-project-config-compare-xml
       - gate-project-config-layout
-      - gate-project-config-pep8
+      - gate-project-config-example-pep8
       - gate-project-config-jenkins-project
     gate:
       - gate-project-config-layout
-      - gate-project-config-pep8
+      - gate-project-config-example-pep8
       - gate-project-config-jenkins-project
 
   - name: openstack-infra/publications