From d406fb03948296cdd02c7b93ffb9433ceb39d872 Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
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 <r-mibu@cq.jp.nec.com>
---
 jjb/3rd_party_ci/odl-netvirt.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'jjb/3rd_party_ci')

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index a57bf176e..f07c37298 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -51,7 +51,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: NETVIRT_ARTIFACT
@@ -86,7 +85,7 @@
                 - name: 'odl-netvirt-verify-virtual-create-apex-vms-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
@@ -104,7 +103,7 @@
                 - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
@@ -132,7 +131,7 @@
                 - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
@@ -174,7 +173,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - '{installer}-defaults'
-- 
cgit