1 files changed, 36 insertions, 38 deletions

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 963e1fd73..7778ecc39 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -1,35 +1,54 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
 - project:
     name: doctor
+
     project: '{name}'
+
     jobs:
-        - '{project}-verify'
-        - '{project}-merge-{stream}'
+        - 'doctor-verify-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-arno)
-    # branch:    branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
+#        - stable-brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
+
+- job_defaults: &doctor_job_defaults
+    name: doctor_job_defaults
 
-- job_defaults: &job_defaults
-    name: job_defaults
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{stream}'
 
 - job-template:
-    name: '{project}-verify'
-    disabled: true
-    <<: *job_defaults
+    name: 'doctor-verify-{stream}'
+
+    <<: *doctor_job_defaults
+
+    parameters:
+        - 'opnfv-build-defaults'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
+
     triggers:
         - gerrit:
             trigger-on:
-                - patchset-created-event
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -39,33 +58,12 @@
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**'
-    builders:
-        - shell:
-            !include-raw docu-build.sh
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{stream}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**|.gitignore'
 
-- job-template:
-    name: '{project}-merge-{stream}'
-    disabled: true
-    <<: *job_defaults
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
     builders:
-        - shell:
-            !include-raw docu-build.sh
+        - shell: |
+            echo "Nothing to verify!"