From 91544508bac089d50c018fe9e33a04618dd51a6c Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Fri, 24 Mar 2017 19:13:21 +0200 Subject: [PATCH] LISPflowmapping: $BRANCH -> $GERRIT_BRANCH Since $BRANCH is no longer set in the environment, use $GERRIT_BRANCH instead. Change-Id: I68e4259d59d2b03eb5d8abecabf810367f182be8 Signed-off-by: Lorand Jakab --- csit/suites/lispflowmapping/scripts/generate_bindings.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/suites/lispflowmapping/scripts/generate_bindings.sh b/csit/suites/lispflowmapping/scripts/generate_bindings.sh index e9d1db34d3..d800ce7110 100755 --- a/csit/suites/lispflowmapping/scripts/generate_bindings.sh +++ b/csit/suites/lispflowmapping/scripts/generate_bindings.sh @@ -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 -- 2.36.6