diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-30 09:55:16 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-02-01 23:02:58 +0000 |
| commit | d406fb03948296cdd02c7b93ffb9433ceb39d872 (patch) | |
| tree | 3458df9618934e62fc92f5b9bcb2dec695923267 /jjb/functest/functest-exit.sh | |
| parent | 462fed8a52a50530ac843f7c4d2519b573749052 (diff) | |
merge GIT_BRANCH and GERRIT_BRANCH into BRANCH
GIT_BRANCH parameter is different; master or stable/danube in daily
jobs, but 'refs/changes/57/27657/6' in verify jobs. This breaks some
job builders triggered by the both types of jobs. We have GERRIT_BRANCH
parameter for verify jobs to identify stream and expected branch into
the patch will be merged after it got +2 and submitted.
To avoid further confusion and to have common job builders for daily
and verify jobs, this patch introduce BRANCH parameter.
GERRIT_BRANCH is now deprecated.
Change-Id: Ibcd42c1cd8a0be0f330878b21d3011f1ec97043b
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb/functest/functest-exit.sh')
| -rw-r--r-- | jjb/functest/functest-exit.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jjb/functest/functest-exit.sh b/jjb/functest/functest-exit.sh index 10edab005..925a3cfbb 100644 --- a/jjb/functest/functest-exit.sh +++ b/jjb/functest/functest-exit.sh @@ -1,7 +1,6 @@ #!/bin/bash -branch=${GIT_BRANCH##*/} -ret_val_file="${HOME}/opnfv/functest/results/${branch}/return_value" +ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" if [ ! -f ${ret_val_file} ]; then echo "Return value not found!" exit -1 @@ -9,4 +8,4 @@ fi ret_val=`cat ${ret_val_file}` -exit ${ret_val}
\ No newline at end of file +exit ${ret_val} |