aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2016-11-26 14:48:49 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2016-11-26 09:44:22 +0000
commit76bcfadc9d69c1fa45e4b401d7263893e7f08ce4 (patch)
tree6c85000a65c34952d56d201c7cf3503664b2ec19
parent177f30ee041f8c0137632eca3a766945567c2c62 (diff)
downloadlinaro-android-build-tools-76bcfadc9d69c1fa45e4b401d7263893e7f08ce4.tar.gz
handle patches from private gerrit instance
Change-Id: Ic653185ff66c04ddc150dfc83f762fcc9967c6e1 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--build-scripts/build-android9
1 files changed, 7 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 74aa7a4..43a236c 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -74,11 +74,16 @@ else
if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_PROJECT != "android-build-configs" ] && [ $GERRIT_EVENT_TYPE == "comment-added" ]; then
if [ "$GERRIT_PROJECT" == "platform/manifest" ]; then
cd .repo/local_manifests;
- git pull http://review.android.git.linaro.org/platform/manifest $GERRIT_REFSPEC
+ git pull http://android-review.linaro.org/platform/manifest $GERRIT_REFSPEC
cd -
else
cd `grep -rni $GERRIT_PROJECT\" .repo/local_manifests | grep -Po 'path="\K[^"]*'`
- if git pull http://${GERRIT_HOST}/${GERRIT_PROJECT} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
+ if [ ${GERRIT_HOST} == "dev-private-review.linaro.org" ]; then
+ GERRIT_URL="ssh://git@${GERRIT_HOST}/${GERRIT_PROJECT}"
+ else
+ GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}"
+ fi
+ if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
git reset --hard
echo "Error: *** Error patch merge failed"
exit 1