Merge gerrit jobs for project-config

Both gate-project-config-projects-yaml and gate-project-config-gerrit
test files in gerrit directory, both check ACLs a swell. Let's merge
those into one job since in most cases both need to be run anyway and
the name projects-yaml might be confused with
jenkins/jobs/projects.yaml.

Note that this one leaves the projects tox environment in so that
testing of this change passes.

Change-Id: I34324643c26d0bcf2d24ce1dc51250ad53f2d48f

jenkins/jobs/infra.yaml

@@ -95,20 +95,6 @@
     publishers:
       - console-log
 
-- job:
-    name: gate-project-config-projects-yaml
-    node: ubuntu-trusty
-
-    builders:
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - tox:
-          envlist: projects
-
-    publishers:
-      - console-log
-
 - job-template:
     name: gate-{name}-bindep-fallback-{node}{job-suffix}
 

tox.ini

@@ -12,7 +12,11 @@ commands =
   flake8
 
 [testenv:gerrit]
+deps = PyYAML
+     GitPython
 commands =
+  {toxinidir}/tools/check_valid_gerrit_projects.py gerrit/projects.yaml gerrit/acls
+  {toxinidir}/tools/check_projects_yaml_alphabetized.sh gerrit/projects.yaml
   {toxinidir}/tools/check_valid_gerrit_config.sh gerrit/acls/
 
 [testenv:projects]

zuul/layout.yaml

@@ -1914,7 +1914,10 @@ jobs:
   - name: gate-project-config-gerrit
     files:
       - '^gerrit/acls/.*$'
+      - 'check_valid_gerrit_projects.py'
+      - 'gerrit/projects.yaml'
       - 'other-requirements.txt'
+      - 'tools/check_projects_yaml_alphabetized.sh'
       - 'tools/check_valid_gerrit_config.sh'
       - 'tox.ini'
 
@@ -1924,14 +1927,6 @@ jobs:
       - 'other-requirements.txt'
       - 'tox.ini'
 
-  - name: gate-project-config-projects-yaml
-    files:
-      - 'check_valid_gerrit_projects.py'
-      - 'gerrit/projects.yaml'
-      - 'other-requirements.txt'
-      - 'tools/check_projects_yaml_alphabetized.sh'
-      - 'tox.ini'
-
   - name: ^gate-project-config-bindep-fallback.*$
     files:
       - 'jenkins/data/bindep-fallback.txt'
@@ -3638,7 +3633,6 @@ projects:
       - gate-project-config-irc-access
       - gate-project-config-jenkins-project
       - gate-project-config-nodepool
-      - gate-project-config-projects-yaml
       - gate-infra-docs-index
       - gate-generate-specs-site
       - gate-project-config-dib
@@ -3650,7 +3644,6 @@ projects:
       - gate-project-config-irc-access
       - gate-project-config-nodepool
       - gate-project-config-jenkins-project
-      - gate-project-config-projects-yaml
       - gate-infra-docs-index
       - gate-generate-specs-site
       - gate-project-config-dib