X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=f93ac9bef9a8233b3f28ae50b2e2c8b79a1dc888;hb=489cd0fd7e6eed490bca2d50eb7706d89284a2c0;hp=8a140f48c3b95fd4a15031b1b9cb7895ef4917aa;hpb=e8dd11b81e3b20f68e47fce29a86e847e1d3560b;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 8a140f48c..f93ac9bef 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -1,42 +1,54 @@
 - project:
     name: doctor
+
     project: '{name}'
-    jobs:
-        - '{project}-verify'
-        - '{project}-merge-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-arno)
-    # branch:    branch (eg. stable/arno)
     stream:
         - master:
-            branch: 'master'
-
-- 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}'
-    wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+            branch: '{stream}'
+            gs-pathname: ''
+            docker_tag: 'master'
+            disabled: false
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            docker_tag: 'stable'
+            disabled: false
+
+    installer:
+        - apex:
+            slave-label: 'ool-virtual1'
+            pod: 'ool-virtual1'
+
+    jobs:
+        - 'doctor-verify-{stream}'
+        - 'doctor-verify-{installer}-{stream}'
 
 - job-template:
-    name: '{project}-verify'
-    <<: *job_defaults
+    name: 'doctor-verify-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-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'
@@ -46,32 +58,87 @@
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'tests/**'
+
     builders:
-        - shell:
-            !include-raw docu-build.sh
+        - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
 
 - job-template:
-    name: '{project}-merge-{stream}'
-    <<: *job_defaults
+    name: 'doctor-verify-{installer}-{stream}'
+
+    node: '{slave-label}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - string:
+            name: OS_CREDS
+            default: /home/jenkins/openstack.creds
+            description: 'OpenStack credentials'
+        - '{slave-label}-defaults'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
     triggers:
         - gerrit:
             trigger-on:
-                - change-merged-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'
                 - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'tests/**'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
     builders:
-        - shell:
-            !include-raw docu-build.sh
+        - trigger-builds:
+          - project: 'functest-{installer}-{pod}-suite-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              CI_DEBUG=true
+              FUNCTEST_SUITE_NAME=doctor
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor
+            block: true
+            same-node: true
+          - project: 'functest-{installer}-{pod}-suite-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              CI_DEBUG=true
+              FUNCTEST_SUITE_NAME=doctor
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor
+            block: true
+            same-node: true
+        - shell: |
+            logfile=$HOME/opnfv/functest/results/{stream}/doctor.log
+            echo
+            echo "[$logfile]"
+            echo
+            [ -e $logfile ] && cat $logfile