X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=af482b597ab4c96c64f50b82b8110b2befda8e1b;hb=03b33bb5cbf2239993f8d11deaa55cb282e7eaef;hp=963e9818ae4129723629590ce316d9d344405fbb;hpb=b13ac31da369f20cfe87111834459ed8012f2f14;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 963e9818a..af482b597 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -1,11 +1,14 @@
 - project:
     name: builder-jobs
     jobs:
-        - 'builder-verify'
+        - 'builder-verify-jjb'
+        - 'builder-verify-python'
         - 'builder-merge'
 
+    project: 'releng/builder'
+
 - job-template:
-    name: builder-verify
+    name: builder-verify-jjb
 
     project-type: freestyle
 
@@ -16,14 +19,16 @@
         artifactNumToKeep: -1
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: 'master'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
             refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
         - ssh-agent-credentials:
@@ -31,8 +36,14 @@
 
     triggers:
         - gerrit:
-            trigger-on-patchset-uploaded-event: true
-            trigger-on-draft-published-event: true
+            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'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng/builder'
@@ -47,12 +58,69 @@
     builders:
         - shell: |
             source /opt/virtualenv/jenkins-job-builder/bin/activate
+            python scripts/jjb-autoupdate-project.py
             jenkins-jobs test jjb/
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
 
+- job-template:
+    name: builder-verify-python
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{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'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'releng/builder'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/master'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: scripts/**
+
+
+    builders:
+        - shell: |
+            flake8 scripts/
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
+
 - job-template:
     name: 'builder-merge'
 
@@ -69,14 +137,16 @@
         artifactNumToKeep: 5
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: 'master'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
             refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
@@ -84,7 +154,10 @@
 
     triggers:
         - gerrit:
-            trigger-on-change-merged-event: true
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng/builder'
@@ -96,14 +169,8 @@
                       pattern: jjb/**
 
     builders:
-        - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs update jjb/
-
-            # Submit patches for any jobs that can be auto updated
-            python scripts/jjb-autoupdate-project.py
-            git commit -asm "Update automated project templates"
-            git push origin HEAD:refs/for/master
+        - shell:
+            !include-raw-escape include-raw-jjb-update.sh
 
     publishers:
         - email-notification: