merge GIT_BRANCH and GERRIT_BRANCH into BRANCH 23/27723/4
authorRyota MIBU <r-mibu@cq.jp.nec.com>
Mon, 30 Jan 2017 09:55:16 +0000 (09:55 +0000)
committerRyota MIBU <r-mibu@cq.jp.nec.com>
Wed, 1 Feb 2017 23:02:58 +0000 (23:02 +0000)
commitd406fb03948296cdd02c7b93ffb9433ceb39d872
tree3458df9618934e62fc92f5b9bcb2dec695923267
parent462fed8a52a50530ac843f7c4d2519b573749052
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>
80 files changed:
jjb-sandbox/releng/releng-sandbox-jobs.yml
jjb/3rd_party_ci/odl-netvirt.yml
jjb/apex/apex.yml
jjb/armband/armband-ci-jobs.yml
jjb/armband/armband-deploy.sh
jjb/armband/armband-download-artifact.sh
jjb/armband/armband-project-jobs.yml
jjb/armband/armband-verify-jobs.yml
jjb/armband/upload-artifacts.sh
jjb/availability/availability.yml
jjb/barometer/barometer.yml
jjb/bottlenecks/bottlenecks-ci-jobs.yml
jjb/bottlenecks/bottlenecks-project-jobs.yml
jjb/compass4nfv/compass-ci-jobs.yml
jjb/compass4nfv/compass-project-jobs.yml
jjb/compass4nfv/compass-verify-jobs.yml
jjb/conductor/conductor.yml
jjb/copper/copper.yml
jjb/cperf/cperf-ci-jobs.yml
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
jjb/doctor/doctor.yml
jjb/domino/domino.yml
jjb/dovetail/dovetail-artifacts-upload.yml
jjb/dovetail/dovetail-ci-jobs.yml
jjb/dovetail/dovetail-project-jobs.yml
jjb/dovetail/dovetail-weekly-jobs.yml
jjb/dpacc/dpacc.yml
jjb/escalator/escalator.yml
jjb/fuel/fuel-daily-jobs.yml
jjb/fuel/fuel-deploy.sh
jjb/fuel/fuel-download-artifact.sh
jjb/fuel/fuel-project-jobs.yml
jjb/fuel/fuel-upload-artifact.sh
jjb/fuel/fuel-verify-jobs-experimental.yml
jjb/fuel/fuel-verify-jobs.yml
jjb/functest/functest-ci-jobs.yml
jjb/functest/functest-exit.sh
jjb/functest/functest-loop.sh
jjb/functest/functest-project-jobs.yml
jjb/functest/functest-suite.sh
jjb/functest/set-functest-env.sh
jjb/global/releng-macros.yml
jjb/infra/bifrost-verify-jobs.yml
jjb/ipv6/ipv6.yml
jjb/joid/joid-daily-jobs.yml
jjb/joid/joid-verify-jobs.yml
jjb/kvmfornfv/kvmfornfv.yml
jjb/moon/moon.yml
jjb/multisite/multisite-daily-jobs.yml
jjb/multisite/multisite-verify-jobs.yml
jjb/netready/netready.yml
jjb/octopus/octopus.yml
jjb/onosfw/onosfw.yml
jjb/opera/opera-daily-jobs.yml
jjb/opera/opera-project-jobs.yml
jjb/opera/opera-verify-jobs.yml
jjb/opnfvdocs/opnfvdocs.yml
jjb/ovsnfv/ovsnfv.yml
jjb/parser/parser.yml
jjb/pharos/pharos.yml
jjb/prediction/prediction.yml
jjb/promise/promise.yml
jjb/qtip/qtip-ci-jobs.yml
jjb/qtip/qtip-project-jobs.yml
jjb/releng/artifact-cleanup.yml
jjb/releng/opnfv-docker.sh
jjb/releng/opnfv-docker.yml
jjb/releng/opnfv-docs.yml
jjb/releng/opnfv-lint.yml
jjb/releng/releng-ci-jobs.yml
jjb/releng/testapi-automate.yml
jjb/securityaudit/opnfv-security-audit.yml
jjb/storperf/storperf.yml
jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
jjb/vswitchperf/vswitchperf.yml
jjb/yardstick/yardstick-ci-jobs.yml
jjb/yardstick/yardstick-daily.sh
jjb/yardstick/yardstick-project-jobs.yml
utils/push-test-logs.sh