From d406fb03948296cdd02c7b93ffb9433ceb39d872 Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Mon, 30 Jan 2017 09:55:16 +0000 Subject: 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 --- jjb/opnfvdocs/opnfvdocs.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'jjb/opnfvdocs') diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index cf7bae5b3..12950338d 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -34,7 +34,6 @@ parameters: - project-parameter: project: $GERRIT_PROJECT - - gerrit-parameter: branch: '{branch}' - string: name: GIT_CLONE_BASE @@ -75,7 +74,6 @@ parameters: - project-parameter: project: $GERRIT_PROJECT - - gerrit-parameter: branch: '{branch}' - string: name: GIT_CLONE_BASE @@ -114,6 +112,7 @@ parameters: - project-parameter: project: '{project}' + branch: '{branch}' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -122,10 +121,6 @@ name: GIT_CLONE_BASE default: ssh://gerrit.opnfv.org:29418 description: "Used for overriding the GIT URL coming from parameters macro." - - string: - name: GERRIT_BRANCH - default: '{branch}' - description: 'Specify the branch in this way in order to be able to use build-opnfv-composite-docs builder.' scm: - git-scm @@ -136,4 +131,3 @@ builders: - build-html-and-pdf-docs-output # - upload-generated-docs-to-opnfv-artifacts - -- cgit 1.2.3-korg