From 966d78702682a0fa2db0e3d24d263877bb6c2a42 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 29 May 2014 16:47:09 +0200 Subject: [PATCH] Ignore failure of git review -s in propose_requirements_update If a project has a broken .gitreview file, git review -s will fail and the job will abort. Just continue in this case. Change-Id: I07cd00cdbbc075d90278b39674a3fb3fc3720054 --- .../files/slave_scripts/propose_requirements_update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh b/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh index 0fb7115de9..bcd0d03238 100755 --- a/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh +++ b/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh @@ -67,8 +67,18 @@ EOF git config user.name "OpenStack Proposal Bot" git config user.email "openstack-infra@lists.openstack.org" git config gitreview.username "proposal-bot" + # Do error checking manually to continue with the next project + # in case of failures like a broken .gitreview file. + set +e git review -s + RET=$? + set -e popd + if [ "$RET" -ne "0" ] ; then + ALL_SUCCESS=1 + echo "Error in git review -s: Ignoring $PROJECT" + continue + fi python update.py $PROJECT_DIR