X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=b17cd9cec69930c4f39c814714034c4261a358b6;hb=ea99da8bf8e8878ad2513728af0a708c6f570ebe;hp=bbd6a00c8a303f8598f7be5412c6718fca13ce9b;hpb=d3c1870e0c2375ceb3da3b550b04f3c476290f5a;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bbd6a00c8..b17cd9cec 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -41,8 +41,11 @@
 
     project-type: freestyle
     archive-artifacts: '**/*.log'
-    project: 'releng/builder'
     build-timeout: '60'
+    # The following two values are only specified here
+    # so that code blocks look similar to other projects.
+    project: 'releng/builder'
+    branch: 'master'
 
 - job-template:
     name: builder-verify-jjb
@@ -70,27 +73,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng/builder'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: 'jjb/**'
 
     builders:
         - shell: |
@@ -107,6 +94,8 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
+# FIXME: Migrate to {project-name}-verify-python-{stream} or delete this entirely,
+#        as there are zero python files (aside docs/conf.py) in releng/builder.
 - job-template:
     name: builder-verify-python
     node: centos7-java-builder-2c-8g
@@ -133,26 +122,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng/builder'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: scripts/**
-
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: 'scripts/**'
 
     builders:
         - shell: |
@@ -211,12 +185,10 @@
                 project-pattern: 'releng/builder'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
 
     builders:
         - shell: |
@@ -336,27 +308,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - 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: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: 'packer/**'
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: 'packer/**'
 
     builders:
         - packer-validate:
@@ -408,7 +364,7 @@
                 project-pattern: 'releng/builder'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
                       pattern: 'packer/**'