X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=cf9f6430bc269d55d890b0a725c7bcf1ef29091a;hb=245eabf87b5c9085dbe7a9ed8702a5bf7991ff68;hp=ddc6efdeaba22e718a659359e7117e5257acf4ee;hpb=664e9c0d49d30d5c02c4aee928d2b197fa40e47c;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index ddc6efdea..cf9f6430b 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -1,41 +1,42 @@
 - 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)
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+            gs-pathname: ''
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+
+- job-template:
+    name: 'doctor-verify-{stream}'
 
-- job_defaults: &job_defaults
-    name: job_defaults
-    node: master
-    project-type: freestyle
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
-- job-template:
-    name: '{project}-verify'
-    <<: *job_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'
@@ -45,32 +46,11 @@
               - 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: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'tests/**'
 
-- job-template:
-    name: '{project}-merge-{stream}'
-    <<: *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: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"