From ee38998064b449b14d1d0ec663e0cec8fa565f48 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 22 Oct 2017 14:19:59 +0200 Subject: [PATCH] It's Zuul Update jenkins/scripts/common.sh which is used by proposal jobs: Do not check for changes by Jenkins, check for changes by Zuul instead. Change-Id: Iff412ce8c75bbdfd82281160e4dd22190d220fb7 --- jenkins/scripts/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/common.sh b/jenkins/scripts/common.sh index 2246d8adcc..e842354d88 100644 --- a/jenkins/scripts/common.sh +++ b/jenkins/scripts/common.sh @@ -74,12 +74,12 @@ function check_already_approved { change_info=$(ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set --format=JSON $CHANGE_ID) # Check for: # 1) Workflow approval (+1) - # 2) no -1/-2 by Jenkins + # 2) no -1/-2 by Zuul # 3) no -2 by reviewers # 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":"-[12]","grantedOn":[0-9]*,"by":{"name":"Jenkins","username":"jenkins"}}' \ + && ! echo $change_info|grep -q '{"type":"Verified","description":"Verified","value":"-[12]","grantedOn":[0-9]*,"by":{"name":"Zuul","username":"zuul"}}' \ && ! 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"