X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=f4a15ef17e1e8acbcddc5be20769b2744264e743;hb=1d89d72210b9a22b819bf14a15398dc4d7bc0ca0;hp=5c5341cbc968d30ea57d083bd488463ea1a0ebad;hpb=ff09b60c3b53e9f3b6e964f5782ce43a5de039a5;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 5c5341cbc..f4a15ef17 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -1,11 +1,16 @@
 - project:
     name: builder-jobs
     jobs:
-        - 'builder-verify'
+        - 'builder-verify-jjb'
+        - 'builder-verify-python'
         - 'builder-merge'
+        - 'builder-weekly'
+        - 'builder-check-poms'
+
+    project: 'releng/builder'
 
 - job-template:
-    name: builder-verify
+    name: builder-verify-jjb
 
     project-type: freestyle
 
@@ -16,23 +21,32 @@
         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:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     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'
@@ -42,17 +56,76 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
-
+                    - compare-type: ANT
+                      pattern: jjb-templates/**
 
     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:
+            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'
+            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,22 +142,28 @@
         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:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     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'
@@ -94,11 +173,81 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
+                    - compare-type: ANT
+                      pattern: jjb-templates/**
+
+    builders:
+        - shell:
+            !include-raw-escape include-raw-jjb-update.sh
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
+
+- job-template:
+    name: 'builder-weekly'
+
+    # builder-daily job to run JJB update weekly
+    #
+    # This job's purpose is to update all the JJB on a weekly (Sunday)
+    # basis with --flush-cache enabled to ensure jobs are okay
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 40
+        artifactDaysToKeep: -1
+        artifactNumToKeep: 5
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'master'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * 0'
 
     builders:
         - shell: |
             source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs update jjb/
+            jenkins-jobs --flush-cache update jjb/
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
+
+- job-template:
+    name: builder-check-poms
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 1
+        numToKeep: 1
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * 1'
+
+    builders:
+        - shell:
+            !include-raw-escape include-raw-check-poms.sh
 
     publishers:
         - email-notification: