From d2b91184b414ef9eb4a2f753456434c991b13763 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 17 Sep 2014 08:22:17 +0200 Subject: [PATCH] Fix for translation early exit Also check for Verified -2. This change got lost by accident in the previous patch I1ca73a03c67b34878244a3ebd926eb9bd60845f7 going from patch set 7 to 8. Change-Id: I9193c7ab0e0d79e26d209a0a8c03ef7cde91d962 --- .../files/slave_scripts/common_translation_update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/slave_scripts/common_translation_update.sh b/modules/openstack_project/files/slave_scripts/common_translation_update.sh index 940fccaa4a..6aecbd20ea 100644 --- a/modules/openstack_project/files/slave_scripts/common_translation_update.sh +++ b/modules/openstack_project/files/slave_scripts/common_translation_update.sh @@ -186,10 +186,10 @@ EOF # 1) Workflow approval (+1) # 2) no -1/-2 by Jenkins # 3) no -2 by reviewers - # 4) and no Workflow -1 (WIP) + # 4) no Workflow -1 (WIP) # if `echo $change_info|grep -q '{"type":"Workflow","description":"Workflow","value":"1"'` \ - && ! `echo $change_info|grep -q '{"type":"Verified","description":"Verified","value":"-1","grantedOn":[0-9]*,"by":{"name":"Jenkins","username":"jenkins"}}'` \ + && ! `echo $change_info|grep -q '{"type":"Verified","description":"Verified","value":"-[12]","grantedOn":[0-9]*,"by":{"name":"Jenkins","username":"jenkins"}}'` \ && ! `echo $change_info|grep -q '{"type":"Code-Review","description":"Code-Review","value":"-2"'` \ && ! `echo $change_info|grep -q '{"type":"Workflow","description":"Workflow","value":"-1"'` ; then echo "Job already approved, exiting"