Migrate to Zuul configuration

Change-Id: I055731ac99ae40960ee1e6a3e5cf0595d8da4600
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/ci-management-jobs.yaml b/jjb/ci-management-jobs.yaml
index 270b9d3..6b9163d 100644 (file)
--- a/jjb/ci-management-jobs.yaml
+++ b/jjb/ci-management-jobs.yaml
@@ -37,30 +37,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: 'ci-management'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                  file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
-
     builders:
         - shell: |
             jenkins-jobs test -o job_output jjb/
@@ -99,24 +75,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: 'ci-management'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                  file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
-
     builders:
         - shell:
             !include-raw-escape include-raw-jjb-update.sh

diff --git a/jjb/csit/csit-vpp-bridge-domain.yaml b/jjb/csit/csit-vpp-bridge-domain.yaml
index 5b85563..ebcdd1f 100644 (file)
--- a/jjb/csit/csit-vpp-bridge-domain.yaml
+++ b/jjb/csit/csit-vpp-bridge-domain.yaml
@@ -45,13 +45,8 @@
                     count: 3
                     stop-on-terminate: False
 
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
     builders:
-        # This is where we will need to insert a step with a script that pulls all the 
+        # This is where we will need to insert a step with a script that pulls all the
         # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh
         # See jjb/integration from ODL
         - shell:

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index dc30fbd..a46f392 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -76,45 +76,6 @@
             timeout: 360
             fail: true
 
-###### TRIGGERS
-- trigger:
-    name: gerrit-trigger-patch-submitted
-    triggers:
-        - gerrit:
-            server-name: 'Default'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{name}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
-- trigger:
-    name: gerrit-trigger-patch-merged
-    triggers:
-        - gerrit:
-            server-name: 'Default'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{name}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
 # Publishers
 - publisher:
     name: archive-artifacts

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 12f1122..0fb731c 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -36,11 +36,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'honeycomb'
-            branch: '{branch}'
-
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
@@ -85,11 +80,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: 'honeycomb'
-            branch: '{branch}'
-
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'

diff --git a/jjb/toolchain_test/toolchain_test-custom.yaml b/jjb/toolchain_test/toolchain_test-custom.yaml
index 7609678..53b54ee 100644 (file)
--- a/jjb/toolchain_test/toolchain_test-custom.yaml
+++ b/jjb/toolchain_test/toolchain_test-custom.yaml
@@ -36,11 +36,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
     builders:
         - shell:
             !include-raw-escape include-raw-toolchain_test-build.sh
@@ -74,11 +69,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
-
     builders:
         - shell:
             !include-raw-escape include-raw-toolchain_test-build.sh

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index caafe1a..6201c08 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -37,11 +37,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh
@@ -78,11 +73,6 @@
             users:
                 - '{ssh-credentials}'
 
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
-
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
new file mode 100644 (file)
index 0000000..23e06b6
--- /dev/null
+++ b/zuul/layout.yaml
@@ -0,0 +1,102 @@
+##############################################################################
+### Pipelines
+##############################################################################
+
+pipelines:
+  - name: check
+    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:
+        verified: 1
+    failure:
+      gerrit:
+        verified: -1
+  # - name: gate
+  #   source: gerrit
+  #   manager: DependentPipelineManager
+  #   trigger:
+  #     gerrit:
+  #       - event: comment-added
+  #         approval:
+  #           - approved: 1
+  #   success:
+  #     gerrit:
+  #       verified: 1
+  #   failure:
+  #     gerrit:
+  #       verified: -1
+  - name: periodic-daily
+    source: gerrit
+    manager: IndependentPipelineManager
+    precedence: low
+    trigger:
+      timer:
+        - time: '0 0 * * *'
+  - name: periodic-weekly
+    source: gerrit
+    manager: IndependentPipelineManager
+    precedence: low
+    trigger:
+      timer:
+        - time: '0 0 * * 0'
+  - name: post-merge
+    source: gerrit
+    manager: IndependentPipelineManager
+    trigger:
+      gerrit:
+        - event: change-merged
+        - event: comment-added
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(remerge)
+    success:
+      gerrit:
+        force-message: True
+    failure:
+      gerrit:
+        force-message: True
+
+##############################################################################
+### Project Templates
+##############################################################################
+
+project-templates:
+  - name: default-jobs
+    check:
+     - '{name}-verify'
+    post-merge:
+     - '{name}-merge'
+
+##############################################################################
+### Projects
+##############################################################################
+
+projects:
+  - name: ci-management
+    check:
+      - ci-management-verify-jjb
+    periodic-weekly:
+      - ci-management-weekly
+    post-merge:
+      - ci-management-merge
+
+  - name: csit
+    check:
+      - csit-vpp-bridge-domain
+
+  - name: honeycomb
+    template:
+      - name: default-jobs
+
+  - name: toolchain_test
+    template:
+      - name: default-jobs
+
+  - name: vpp
+    template:
+      - name: default-jobs