LISPflowmapping: $BRANCH -> $GERRIT_BRANCH 04/53804/1
authorLorand Jakab <lojakab@cisco.com>
Fri, 24 Mar 2017 17:13:21 +0000 (19:13 +0200)
committerLorand Jakab <lojakab@cisco.com>
Fri, 24 Mar 2017 17:15:19 +0000 (19:15 +0200)
Since $BRANCH is no longer set in the environment, use $GERRIT_BRANCH
instead.

Change-Id: I68e4259d59d2b03eb5d8abecabf810367f182be8
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
csit/suites/lispflowmapping/scripts/generate_bindings.sh

index e9d1db34d35df7ccd0de60b06e23a797d357f0a2..d800ce7110180fa85aaf7ae733a7ad7a51540cc8 100755 (executable)
@@ -8,9 +8,9 @@ DIRECTORY="odl-lispflowmapping-yang-files"
 # contain all the binding files generated by pyangbind.
 mkdir -p ${WORKSPACE}/$DIRECTORY
 
-GITWEB_LISP="https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=blob_plain;hb=refs/heads/${BRANCH}"
-GITWEB_MDSAL="https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=blob_plain;hb=refs/heads/${BRANCH}"
-GITWEB_CONTROLLER="https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blob_plain;hb=refs/heads/${BRANCH}"
+GITWEB_LISP="https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=blob_plain;hb=refs/heads/${GERRIT_BRANCH}"
+GITWEB_MDSAL="https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=blob_plain;hb=refs/heads/${GERRIT_BRANCH}"
+GITWEB_CONTROLLER="https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blob_plain;hb=refs/heads/${GERRIT_BRANCH}"
 
 # Download yang-files in the VM on fly using curl before generating
 # binding files.
@@ -22,7 +22,7 @@ curl "$GITWEB_LISP;f=mappingservice/lisp-proto/src/main/yang/odl-lisp-address-ty
 
 # Currently there is dependency revisions inconsistency in beryllium
 # for ietf-yang-types and ietf-inet-types
-if [ ${BRANCH} = "stable/beryllium" ]
+if [ ${GERRIT_BRANCH} = "stable/beryllium" ]
 then
     curl "$GITWEB_MDSAL;f=model/ietf/ietf-yang-types/src/main/yang/ietf-yang-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
     curl "$GITWEB_MDSAL;f=model/ietf/ietf-inet-types/src/main/yang/ietf-inet-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang