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

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 2abb94696..2267a28f7 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -7,7 +7,7 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-            docker-tag: 'master'
+            docker-tag: 'latest'
             disabled: false
         - danube:
             branch: 'stable/{stream}'
@@ -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'
@@ -51,7 +50,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -92,13 +90,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - string:
-            name: GIT_BRANCH
-            default: 'origin/{branch}'
-            description: "Override GIT_BRANCH parameter as we need stream name here"
-            #TODO(r-mibu): remove this work around by cleanup *_BRANCH params
         - string:
             name: OS_CREDS
             default: /home/jenkins/openstack.creds
@@ -152,11 +144,10 @@
             branch: '{branch}'
 
     builders:
+        - 'clean-workspace-log'
         - '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
@@ -164,6 +155,8 @@
     publishers:
         - archive:
             artifacts: 'tests/*.log'
+        - archive:
+            artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
 
 
 #####################################