X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=807d436da20c17a0b038de8fdf580df4f34a86ee;hb=254c0da70b1fbb9b7b1e7ad1944536e6eb244ea0;hp=11b4ffbc2e8337ed81b705c0e1acffa1e12463ed;hpb=f6fb85d278ada5d2a407c49a7f4c5de9c81b8d67;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 11b4ffbc2..807d436da 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -22,7 +22,6 @@
         - fuel:
             slave-label: 'ool-virtual2'
             pod: 'ool-virtual2'
-        # TODO(r-mibu): enable this once joid is ready
         #- joid:
         #    slave-label: 'ool-virtual3'
         #    pod: 'ool-virtual3'
@@ -113,7 +112,7 @@
         # functest-suite-parameter
         - string:
             name: FUNCTEST_SUITE_NAME
-            default: '{project}'
+            default: 'doctor-notification'
         - string:
             name: TESTCASE_OPTIONS
             default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -v $WORKSPACE:/home/opnfv/repos/doctor'
@@ -145,11 +144,17 @@
             branch: '{branch}'
 
     builders:
+        - 'clean-workspace-log'
+        - shell: |
+            # NOTE: Create symbolic link, so that we can archive file outside
+            #       of $WORKSPACE .
+            # NOTE: We are printing all logs under 'tests/' during test run,
+            #       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
         - 'functest-suite-builder'
         - shell: |
             functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
-            to_be_archived="$WORKSPACE/tests/functest-{project}.log"
-            cp $functest_log $to_be_archived
             # 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
@@ -157,6 +162,8 @@
     publishers:
         - archive:
             artifacts: 'tests/*.log'
+        - archive:
+            artifacts: 'functest_results/{project}.log'
 
 
 #####################################