X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=zuul%2Flayout.yaml;h=fccd68f37cc9d2a399462d3edef2bbaa3b57dfd6;hb=39ece31f9a41e7d192bb385f5abf4a30e5f87f5d;hp=23e06b61e3bbcf9c67f213ad19db679f4ce99fb3;hpb=b4263dde9bd10371e3f449ac204108bc7bdd7a09;p=ci-management.git

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 23e06b61e..fccd68f37 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 ### Pipelines
 ##############################################################################
@@ -18,6 +19,19 @@ pipelines:
     failure:
       gerrit:
         verified: -1
+  - name: check-novote
+    source: gerrit
+    manager: IndependentPipelineManager
+    trigger:
+      gerrit:
+        - event: patchset-created
+        - event: draft-published
+        - event: comment-added
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify)
+    success:
+      gerrit: {}
+    failure:
+      gerrit: {}
   # - name: gate
   #   source: gerrit
   #   manager: DependentPipelineManager
@@ -49,17 +63,30 @@ pipelines:
   - name: post-merge
     source: gerrit
     manager: IndependentPipelineManager
+    success-message: Build succeeded (check merge)
+    failure-message: Build failed (check merge)
     trigger:
       gerrit:
         - event: change-merged
         - event: comment-added
           comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(remerge)
+    success:
+      gerrit: {}
+    failure:
+      gerrit: {}
+  - name: csit-manual-perf
+    source: gerrit
+    manager: IndependentPipelineManager
+    trigger:
+      gerrit:
+        - event: comment-added
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(hw-perf-check)
     success:
       gerrit:
-        force-message: True
+        verified: 1
     failure:
       gerrit:
-        force-message: True
+        verified: -1
 
 ##############################################################################
 ### Project Templates
@@ -68,9 +95,9 @@ pipelines:
 project-templates:
   - name: default-jobs
     check:
-     - '{name}-verify'
+      - '{name}-verify'
     post-merge:
-     - '{name}-merge'
+      - '{name}-merge'
 
 ##############################################################################
 ### Projects
@@ -80,23 +107,25 @@ projects:
   - name: ci-management
     check:
       - ci-management-verify-jjb
-    periodic-weekly:
-      - ci-management-weekly
+      - ci-management-verify-zuul
+      - ci-management-verify-nodepool
     post-merge:
-      - ci-management-merge
+      - ci-management-merge-jjb
+      - ci-management-merge-zuul
+      - ci-management-merge-nodepool
 
-  - name: csit
-    check:
-      - csit-vpp-bridge-domain
+#  - name: csit
+#    csit-manual-perf:
+#      - csit-vpp-functional-hw-tb2
+#    check:
+#      - csit-vpp-functional-virl
+#      - csit-vpp-functional-nodepool
 
-  - name: honeycomb
-    template:
-      - name: default-jobs
+#  - name: honeycomb
+#    template:
+#      - name: default-jobs
 
-  - name: toolchain_test
-    template:
-      - name: default-jobs
+#  - name: vpp
+#    check-novote:
+#      - vpp-csit-verify-virl
 
-  - name: vpp
-    template:
-      - name: default-jobs