X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=2267a28f7182b36c3cb4c77b9fe5fff08b7d6a48;hb=c685d2fa93180818a4b960608cfb923dc7755941;hp=7a5bd22f2a42618589759b944409a40d9a607432;hpb=5f4cd7d30efd8bf917c9a01b2173c68c853d52d0;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 7a5bd22f2..2267a28f7 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -7,9 +7,9 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-            docker-tag: 'master'
+            docker-tag: 'latest'
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             docker-tag: 'stable'
@@ -19,14 +19,28 @@
         - apex:
             slave-label: 'ool-virtual1'
             pod: 'ool-virtual1'
+        - fuel:
+            slave-label: 'ool-virtual2'
+            pod: 'ool-virtual2'
+        #- joid:
+        #    slave-label: 'ool-virtual3'
+        #    pod: 'ool-virtual3'
 
     inspector:
         - 'sample'
         - 'congress'
 
+    task:
+        - verify:
+            profiler: 'none'
+            auto-trigger-name: 'doctor-verify'
+        - profiling:
+            profiler: 'poc'
+            auto-trigger-name: 'experimental'
+
     jobs:
         - 'doctor-verify-{stream}'
-        - 'doctor-verify-{installer}-{inspector}-{stream}'
+        - 'doctor-{task}-{installer}-{inspector}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -36,15 +50,11 @@
     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'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -73,28 +83,28 @@
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
 
 - job-template:
-    name: 'doctor-verify-{installer}-{inspector}-{stream}'
+    name: 'doctor-{task}-{installer}-{inspector}-{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'
-        - string:
-            name: INSTALLER_TYPE
-            default: '{installer}'
-            description: 'Installer used for deploying OPNFV on this POD'
+        - '{installer}-defaults'
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -105,7 +115,7 @@
             default: '{project}'
         - string:
             name: TESTCASE_OPTIONS
-            default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
+            default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -v $WORKSPACE:/home/opnfv/repos/doctor'
             description: 'Addtional parameters specific to test case(s)'
         # functest-parameter
         - string:
@@ -126,11 +136,34 @@
             description: "Show debug output information"
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
+    triggers:
+        - '{auto-trigger-name}':
+            project: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - 'clean-workspace-log'
+        - 'functest-suite-builder'
+        - shell: |
+            functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
+            # NOTE: checking the test result, as the previous job could return
+            #       0 regardless the result of doctor test scenario.
+            grep -e ' OK$' $functest_log || exit 1
+
+    publishers:
+        - archive:
+            artifacts: 'tests/*.log'
+        - archive:
+            artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
+
+
+#####################################
+# trigger macros
+#####################################
+- trigger:
+    name: 'doctor-verify'
     triggers:
         - gerrit:
             server-name: 'gerrit.opnfv.org'
@@ -158,12 +191,3 @@
                 failed: true
                 unstable: true
                 notbuilt: true
-
-    builders:
-        - 'functest-suite-builder'
-        - shell: |
-            cp $HOME/opnfv/functest/results/{stream}/{project}.log $WORKSPACE/tests/
-
-    publishers:
-        - archive:
-            artifacts: 'tests/*.log'