merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / doctor / doctor.yml

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e8b814c..11b4ffb 100644 (file)
--- 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}'
@@ -51,7 +51,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -92,7 +91,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: OS_CREDS
@@ -149,7 +147,7 @@
     builders:
         - 'functest-suite-builder'
         - shell: |
-            functest_log="$HOME/opnfv/functest/results/{project}.log"
+            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