diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-09-01 10:33:46 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-09-01 10:33:46 +0530 |
| commit | 57600e7c5347bb0c2e021b5f19fb59c5838e9373 (patch) | |
| tree | f26bb1161a1daf7cae38e78cbf3daefb140a7331 /acov.sh | |
| parent | 47cbec055d293bb6b55b2a0688979c8d6f8eaddb (diff) | |
Don't report back to gerrit where it failed
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Diffstat (limited to 'acov.sh')
| -rwxr-xr-x | acov.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -92,8 +92,8 @@ if [ $? -ne 0 ]; then echo "Error: *** Error repo sync failed" if [ -n "$GERRIT_PROJECT" ]; then rm -rf ~/.ssh/known_hosts - ssh-keyscan -t rsa -p 29418 dev-private-review.linaro.org >> ~/.ssh/known_hosts - ssh -p $GERRIT_PORT linaro-big-little-switcher-bot@$GERRIT_HOST gerrit review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER +# ssh-keyscan -t rsa -p 29418 dev-private-review.linaro.org >> ~/.ssh/known_hosts +# ssh -p $GERRIT_PORT linaro-big-little-switcher-bot@$GERRIT_HOST gerrit review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER fi exit -1 fi @@ -115,8 +115,8 @@ if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; th cd `grep -rni $GERRIT_PROJECT\" .repo/local_manifests | grep -Po 'path="\K[^"]*'` if git pull ssh://git@$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC | grep -q "Automatic merge failed" ; then rm -rf ~/.ssh/known_hosts - ssh-keyscan -t rsa -p 29418 dev-private-review.linaro.org >> ~/.ssh/known_hosts - ssh -p $GERRIT_PORT linaro-big-little-switcher-bot@$GERRIT_HOST gerrit review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER +# ssh-keyscan -t rsa -p 29418 dev-private-review.linaro.org >> ~/.ssh/known_hosts +# ssh -p $GERRIT_PORT linaro-big-little-switcher-bot@$GERRIT_HOST gerrit review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER git reset --hard echo "Error: *** Error patch merge failed" exit -1 |