[doctor] correct GIT_BRANCH

also reverting I418ba21c0579311adb2b7efc89be841e5688c02d

Change-Id: Ia9098bb1bd69148eb30a9195a424aaa78ec4dd18
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e8b814c..2abb946 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -94,6 +94,11 @@
             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
@@ -149,7 +154,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