X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng-templates.yaml;h=bd9be9725c8addc1a38f0cc0482a3b6c5877861d;hb=f38e9b8ef37999adace828e7662136106a640692;hp=270820027e00aa11dc34578a4eaa0023b1b540ae;hpb=99a55919ef0705b694f856d4e655c3dfebda9a59;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 270820027..bd9be9725 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -8,8 +8,9 @@
     node: '{build-node}'
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '30'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 30
 
     parameters:
         - opendaylight-infra-parameters:
@@ -55,6 +56,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -104,20 +106,16 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-# Python Related
+# Generic tox-based verify action
 
-- job-template:
-    name: '{project-name}-verify-python-{stream}'
+- tox_builder_verify: &tox_builder_verify
+    name: tox_builder_verify
 
-    # Job template for python verify jobs
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
     # Required Variables:
     #     stream:    release stream (eg. boron or carbon)
     #     branch:    git branch (eg. stable/boron or master)
@@ -128,11 +126,9 @@
     node: '{build-node}'
     concurrent: true
 
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '-1'
-        artifactDaysToKeep: '-1'
-        artifactNumToKeep: '-1'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 7
 
     parameters:
         - opendaylight-infra-parameters:
@@ -157,27 +153,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            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: '{toxdir}/**'
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: '{toxdir}/**'
 
     builders:
         - shell: |
@@ -191,10 +171,45 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
+- job-template:
+    name: '{project-name}-verify-tox-{stream}'
+
+    # Job template for verify jobs executing tox envlist
+    #
+    # The purpose of this job template is to run tox for projects using this
+    # template.
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     toxdir:    directory containing the project's tox.ini relative to
+    #                the workspace. Empty works if tox.ini is at project root.
+
+    <<: *tox_builder_verify
+
+# Python (pep8) specific, project should migrate to {project-name}-verify-tox-{stream}
+
+- job-template:
+    name: '{project-name}-verify-python-{stream}'
+
+    # Job template for python verify jobs
+    #
+    # The purpose of this job template is to run tox for projects using this
+    # template.
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     toxdir:    directory containing the project's tox.ini relative to
+    #                the workspace. Empty works if tox.ini is at project root.
+
+    <<: *tox_builder_verify
+
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
@@ -216,6 +231,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: '{project}'
             branch: '{branch}'
 
@@ -225,6 +241,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -250,11 +267,9 @@
     node: '{build-node}'
     concurrent: true
 
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '-1'
-        artifactDaysToKeep: '-1'
-        artifactNumToKeep: '-1'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 7
 
     parameters:
         - opendaylight-infra-parameters:
@@ -279,27 +294,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            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: '{nodedir}/**'
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: '{nodedir}/**'
 
     builders:
         - shell: |
@@ -320,6 +319,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'