Merge "Fixes for info votes"

diff --git a/jjb/lf-info-vote.yaml b/jjb/lf-info-vote.yaml
index 012400f..3c421aa 100644 (file)
--- a/jjb/lf-info-vote.yaml
+++ b/jjb/lf-info-vote.yaml
@@ -53,12 +53,12 @@
     gerrit_verify_triggers:
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(vote)$'
-      - comment-added:
+      - comment-added-event:
           approval-category: 'CRVW'
-          approval-value: '+2'
+          approval-value: 2
       - comment-added:
           approval-category: 'Code-Review'
-          approval-value: '+2'
+          approval-value: 2
 
     #####################
     # Job Configuration #

diff --git a/releasenotes/notes/lf-info-vote-74329a41dfea62be.yaml b/releasenotes/notes/lf-info-vote-74329a41dfea62be.yaml
index e94e31d..0b7a963 100644 (file)
--- a/releasenotes/notes/lf-info-vote-74329a41dfea62be.yaml
+++ b/releasenotes/notes/lf-info-vote-74329a41dfea62be.yaml
@@ -2,6 +2,6 @@
 features:
   - |
     New ``info-vote-verify`` macro
-    Will count votes against an INFO.yaml change and sumbit
-    automatically if a majority of committers and tsc mebers
-    vote +1 or +2 on the change.
+    Will count votes against an INFO.yaml change and sumbit automatically
+    if a majority of committers vote +1 or +2 on the change.
+    Job is triggered by +2 votes or a comment of "vote"

diff --git a/shell/check-info-votes.sh b/shell/check-info-votes.sh
index 892dd89..72dec3b 100644 (file)
--- a/shell/check-info-votes.sh
+++ b/shell/check-info-votes.sh
@@ -9,7 +9,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 echo "---> check-info-votes.sh"
-set -xe -o pipefail
+set -u unset
 
 ref=$(echo "$GERRIT_REFSPEC" | awk -F"/" '{ print $4 }')
 pip="pip3"
@@ -45,5 +45,5 @@ if [[ "$exit_status" -ne 0 ]]; then
   exit "$exit_status"
 else
   echo "Vote completed submitting review"
-  ssh -p "$GERRIT_PORT" "$JENKINS_SSH_CREDENTIAL"@"$GERRIT_HOST" gerrit review "$change" --submit
+  ssh -p "$GERRIT_PORT" "$USER"@"$GERRIT_HOST" gerrit review "$change" --submit
 fi