From 8159d5acde885e69c798619da188e9c09d9eb999 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 23 Apr 2014 12:38:03 -0700 Subject: [PATCH] Handle additional reqs push failure as non failing When pushing changes to gerrit for requirements proposals there are cases where we want to ignore push errors. Specifically when gerrit is complaining because you are pushing the same commit or one with identical comments. We should just ignore these errors as it means the current reqs proposal is up to date. See https://review.openstack.org/Documentation/error-no-changes-made.html for more info. Change-Id: I5d7a1991449a80f570191eaad49dc3f9a0ff1a6a --- .../jenkins/files/slave_scripts/propose_requirements_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh index d710ac63a0..0fb7115de9 100755 --- a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh @@ -83,7 +83,7 @@ EOF set +e OUTPUT=$(git review -t $TOPIC $BRANCH) RET=$? - [[ "$RET" -eq "0" || "$OUTPUT" =~ "no new changes" ]] + [[ "$RET" -eq "0" || "$OUTPUT" =~ "no new changes" || "$OUTPUT" =~ "no changes made" ]] SUCCESS=$? [[ "$SUCCESS" -eq "0" && "$ALL_SUCCESS" -eq "0" ]] ALL_SUCCESS=$?