X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=012d37398530153ae50338a92cf8d49ea4569535;hb=47db0fc928385bae729ddc4edaeaa40b15e49229;hp=c5454c799f7ddbfcad31ea26840bd86755cf9299;hpb=0c1d6689656da269d9020e55e81f215d6f5a05a2;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index c5454c799..012d37398 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'
@@ -30,22 +30,16 @@
 
     task:
         - verify:
-            profiler: 'none'
             auto-trigger-name: 'doctor-verify'
             is-python: false
-        - profiling:
-            profiler: 'poc'
-            auto-trigger-name: 'experimental'
-            is-python: false
         - python-verify:
-            profiler: 'none'
             auto-trigger-name: 'doctor-verify'
             is-python: true
 
     pod:
-        - arm-pod2:
+        - armband-baremetal:
             slave-label: '{pod}'
-        - arm-pod3:
+        - armband-virtual:
             slave-label: '{pod}'
 
     jobs:
@@ -88,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"
@@ -114,6 +108,7 @@
         - '{auto-trigger-name}':
             project: '{project}'
             branch: '{branch}'
+            files: 'doctor_tests/**'
 
     builders:
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@ -152,7 +147,7 @@
             default: 'doctor-notification'
         - string:
             name: TESTCASE_OPTIONS
-            default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
+            default: '-e INSPECTOR_TYPE={inspector} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
             description: 'Addtional parameters specific to test case(s)'
         # functest-parameter
         - string:
@@ -179,6 +174,7 @@
         - '{auto-trigger-name}':
             project: '{project}'
             branch: '{branch}'
+            files: 'doctor_tests/**'
 
     builders:
         - 'clean-workspace-log'
@@ -189,18 +185,24 @@
             #       so this symbolic link should not be in 'tests/'. Otherwise,
             #       we'll have the same log twice in jenkins console log.
             ln -sfn $HOME/opnfv/functest/results/{stream} functest_results
+            # NOTE: Get functest script in $WORKSPACE. This functest script is
+            #       needed to perform VM image download in set-functest-env.sh
+            #       from E release cycle.
+            mkdir -p functest/ci
+            wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O functest/ci/download_images.sh
         - 'functest-suite-builder'
         - shell: |
-            functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
+            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/{project}.log'
+            artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
+        - email-jenkins-admins-on-failure
 
 
 #####################################
@@ -229,7 +231,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'tests/**'
+                    pattern: '{files}'
             skip-vote:
                 successful: true
                 failed: true