X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=c80642979b087f17637e3913ed6209613ed09216;hb=ed3d7f310efbad4094e924aa722978cb3ffa5ecb;hp=d535d6109b84044f8d21673056d59669c24fa980;hpb=916a486f391728e1e45a4ce4ea8bf5f584e1079b;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index d535d6109..c80642979 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -9,7 +9,7 @@
             gs-pathname: ''
             docker-tag: 'latest'
             disabled: false
-        - danube:
+        - euphrates:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             docker-tag: 'stable'
@@ -37,9 +37,9 @@
             is-python: true
 
     pod:
-        - arm-pod2:
+        - armband-baremetal:
             slave-label: '{pod}'
-        - arm-pod5:
+        - armband-virtual:
             slave-label: '{pod}'
 
     jobs:
@@ -82,7 +82,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'tests/**'
+                    pattern: 'doctor_tests/**'
 
     builders:
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@ -108,7 +108,7 @@
         - '{auto-trigger-name}':
             project: '{project}'
             branch: '{branch}'
-            files: 'tests/**'
+            files: 'doctor_tests/**'
 
     builders:
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@ -142,6 +142,9 @@
             default: 'os-nosdn-nofeature-ha'
             description: 'Scenario to deploy and test'
         # functest-suite-parameter
+        - string:
+            name: FUNCTEST_MODE
+            default: 'testcase'
         - string:
             name: FUNCTEST_SUITE_NAME
             default: 'doctor-notification'
@@ -174,7 +177,7 @@
         - '{auto-trigger-name}':
             project: '{project}'
             branch: '{branch}'
-            files: 'tests/**'
+            files: 'doctor_tests/**'
 
     builders:
         - 'clean-workspace-log'
@@ -195,11 +198,11 @@
             functest_log="$HOME/opnfv/functest/results/{stream}/$FUNCTEST_SUITE_NAME.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
+            grep -e 'doctor test successfully' $functest_log || exit 1
 
     publishers:
         - archive:
-            artifacts: 'tests/*.log'
+            artifacts: 'doctor_tests/*.log'
         - archive:
             artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
         - email-jenkins-admins-on-failure