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/set-functest-env.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/set-functest-env.sh')
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 583ce8041..afd656f52 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -56,8 +56,7 @@ DEPLOY_TYPE=baremetal echo "Functest: Start Docker and prepare environment" -branch=${GIT_BRANCH##*/} -dir_result="${HOME}/opnfv/functest/results/${branch}" +dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* results_vol="-v ${dir_result}:/home/opnfv/functest/results" @@ -96,9 +95,9 @@ if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 fi -if [[ ${branch} == *"brahmaputra"* ]]; then +if [[ "$BRANCH" =~ 'brahmaputra' ]]; then cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh" -elif [[ ${branch} == *"colorado"* ]]; then +elif [[ "$BRANCH" =~ 'colorado' ]]; then cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start" else cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start" |