diff options
author | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-30 08:07:59 +0000 |
---|---|---|
committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-30 08:25:56 +0000 |
commit | 84f174bbfe355b95d1bd693c419abbabe361abf4 (patch) | |
tree | aab13e816c90cef47c4b1cc391687db589ef8c68 /jjb | |
parent | 894812397e08aa23d0a5ccdbb3370dc33c83f1e9 (diff) |
[doctor] correct GIT_BRANCH
also reverting I418ba21c0579311adb2b7efc89be841e5688c02d
Change-Id: Ia9098bb1bd69148eb30a9195a424aaa78ec4dd18
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/doctor/doctor.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index e8b814cc6..2abb94696 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -95,6 +95,11 @@ - 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 description: 'OpenStack credentials' @@ -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 |