From 36f7bbbf2230945f7bd0ab075e37c0ea3cf4a6a9 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Fri, 7 Mar 2014 14:43:29 -0800
Subject: [PATCH] update trigger to match new workflow label

after upgrading gerrit to ver 2.8, review.o.o will have a new label called 'Workflow'
that combines approved and wip labels. Updating the trigger to match the label.

We need to keep the 'approved' label so it will continue to work with gerrit ver 2.4.4

The gerrit workflow label is defined as:

[label "Workflow"]
        function = MaxWithBlock
        value = -1 Work in progress
        value =  0 Ready for reviews
        value = +1 Approved

Note: This same change has already been applied and tested on review-dev.o.o
Ieb7e2dde49cd64f2aa3dbf939c391492d73ed886

Partial-Bug: #1082781
Change-Id: I849eca5f5c20a21ad0007541ea60c82e2da343e0
---
 modules/openstack_project/files/zuul/layout.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6fe4b3d9b3..06583faf4a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -19,26 +19,26 @@ pipelines:
               older-than: 72h
         - event: comment-added
           require-approval:
-            - approved: 1
+            - workflow: 1
             - username: jenkins
               older-than: 24h
         - event: comment-added
           comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*reverify( (?:bug|lp)[\s#:]*(\d+))\s*$
           require-approval:
-            - approved: 1
+            - workflow: 1
             - username: jenkins
         - event: comment-added
           require-approval:
             - verified: -1
               username: jenkins
           approval:
-            - approved: 1
+            - workflow: 1
         - event: comment-added
           require-approval:
             - verified: -2
               username: jenkins
           approval:
-            - approved: 1
+            - workflow: 1
     start:
       gerrit:
         verified: 0
@@ -62,14 +62,14 @@ pipelines:
               username: jenkins
               newer-than: 24h
           approval:
-            - approved: 1
+            - workflow: 1
         - event: comment-added
           require-approval:
             - verified: 2
               username: jenkins
               newer-than: 24h
           approval:
-            - approved: 1
+            - workflow: 1
         - event: comment-added
           approval:
             - verified: 1