Add verify / merge zuul jobs and update layout

* Update the zuul layout.yaml with changes that are currently being hand
managed.

* Add in the verify and merge jobs for zuul (which have temporarily
  been handmanged in as well)

Change-Id: I1f86488165f384def27d03593d161a56f955e4b9
Signed-off-by: Andrew Grimberg <[email protected]>

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b312e3d..f826da3 100644 (file)
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 ### Pipelines
 ##############################################################################
@@ -68,9 +69,9 @@ pipelines:
 project-templates:
   - name: default-jobs
     check:
-     - '{name}-verify'
+      - '{name}-verify'
     post-merge:
-     - '{name}-merge'
+      - '{name}-merge'
 
 ##############################################################################
 ### Projects
@@ -80,23 +81,19 @@ projects:
   - name: ci-management
     check:
       - ci-management-verify-jjb
-    periodic-weekly:
-      - ci-management-weekly
+      - ci-management-verify-zuul
     post-merge:
-      - ci-management-merge
+      - ci-management-merge-jjb
+      - ci-management-merge-zuul
 
-  - name: csit
-    check:
-      - csit-vpp-bridge-domain
-
-  - name: honeycomb
-    template:
-      - name: default-jobs
+#  - name: csit
+#    check:
+#      - csit-vpp-bridge-domain
 
-  - name: toolchain_test
-    template:
-      - name: default-jobs
+#  - name: honeycomb
+#    template:
+#      - name: default-jobs
 
-  - name: vpp
-    template:
-      - name: default-jobs
+#  - name: vpp
+#    template:
+#      - name: default-jobs