Undo switch off of Gerrit Trigger

I can't keep working on this anymore today and leaving it configured for
zuul overrnight is a broken concept.

This moves everything back to Gerrit Trigger control. We can move jobs
individually tomorrow.

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

diff --git a/jjb/ci-management-jobs.yaml b/jjb/ci-management-jobs.yaml
index 40b907e..9f29879 100644 (file)
--- a/jjb/ci-management-jobs.yaml
+++ b/jjb/ci-management-jobs.yaml
@@ -37,6 +37,30 @@
             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 --recursive -o job_output jjb/
@@ -75,6 +99,24 @@
             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 ebcdd1f..5b85563 100644 (file)
--- a/jjb/csit/csit-vpp-bridge-domain.yaml
+++ b/jjb/csit/csit-vpp-bridge-domain.yaml
@@ -45,8 +45,13 @@
                     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 a46f392..dc30fbd 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -76,6 +76,45 @@
             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 0fb731c..12f1122 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -36,6 +36,11 @@
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'honeycomb'
+            branch: '{branch}'
+
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
@@ -80,6 +85,11 @@
             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 53b54ee..7609678 100644 (file)
--- a/jjb/toolchain_test/toolchain_test-custom.yaml
+++ b/jjb/toolchain_test/toolchain_test-custom.yaml
@@ -36,6 +36,11 @@
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw-escape include-raw-toolchain_test-build.sh
@@ -69,6 +74,11 @@
             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 6201c08..caafe1a 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -37,6 +37,11 @@
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh
@@ -73,6 +78,11 @@
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh