Standardize ci-puppet merge job.

Change-Id: I68993cc8544fa047aa8cd4c8e0d94b3592cbbb24
Reviewed-on: https://review.openstack.org/11165
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml

@@ -3,36 +3,8 @@
     github-org: openstack
     node: precise
     
-    # TODO: standardize
-    #jobs:
-    #  - gate-{name}-merge
-
-- job:
-    name: gate-ci-puppet-merge
-    concurrent: true
-    node: precise
-
-    properties:
-      - github:
-          url: https://github.com/openstack/openstack-ci-puppet
-      - throttle:
-          max-per-node: 0
-          max-total: 0
-          option: project
-          enabled: false
-
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-
-    triggers:
-      - zuul
-
-    builders:
-      - gerrit-git-prep
-
+    jobs:
+      - gate-{name}-merge
 
 - job:
     name: gate-ci-puppet-syntax

modules/openstack_project/files/jenkins_job_builder/config/zuul.yml

@@ -5,10 +5,9 @@
     jobs:
       - python-jobs
       - gate-{name}-pyflakes
-      # TODO: standardize this
-      #- '{name}-docs
 
 
+# This is a non-standard docs job because it uses SCP instead of FTP
 - job:
     name: zuul-docs
     project-type: freestyle