Merge "Add post-merge queue."

modules/jenkins_jobs/files/projects/openstack/gerrit.yml

@@ -168,7 +168,6 @@ modules:
   - properties
   - scm
   - assignednode
-  - trigger_gerrit
   - builders:prebuilders
   - builders:postbuilders
   - publisher_war
@@ -180,20 +179,28 @@ main:
   project: 'gerrit'
   authenticatedBulid: 'false'
   disabled: 'false'
+  concurrent: 'true'
 
-trigger:
+parameters:
-  triggerOnPatchsetUploadedEvent: 'false'
+  - name: UUID
-  triggerOnChangeMergedEvent: 'false'
+    type: string
-  triggerOnCommentAddedEvent: 'false'
+    description: Zuul provided key to link builds with Gerrit events
-  triggerOnRefUpdatedEvent: 'true'
+  - name: GERRIT_PROJECT
-  triggerApprovalCategory: ''
+    type: string
-  triggerApprovalValue: ''
+    description: Zuul provided project name
-  failureMessage: ''
+  - name: GERRIT_REFNAME
-  projects:
+    type: string
-    - projectCompareType: 'PLAIN'
+    description: Zuul provided ref name
-      projectPattern: 'openstack-ci/gerrit'
+  - name: GERRIT_OLDREV
-      branchCompareType: 'REG_EXP'
+    type: string
-      branchPattern: '^(?!refs/).*$'
+    description: Zuul provided old reference for ref-updated
+  - name: GERRIT_NEWREV
+    type: string
+    description: Zuul provided new reference for ref-updated
+
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
 
 prebuilders:
   - gerrit_git_prep

modules/openstack-ci-config/files/zuul/layout.yaml

@@ -18,6 +18,11 @@ queue:
       submit: true
     failure:
       verified: -2
+  - name: post
+    manager: IndependentQueueManager
+    trigger:
+      - event: ref-updated
+        ref: ^(?!refs/).*$
 
 jobs:
   - name: gate-zuul-merge
@@ -51,3 +56,5 @@ projects:
     gate:
       - gate-gerrit-merge:
         - gate-gerrit-unittests
+    post:
+      - gerrit-package