refactor email recipients to parameter with default value

[releng/builder.git] / jjb / releng-templates.yaml

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 1539ba1bb90c8fd573c0d35c1d3834f6893d3f48..f6605551b459c7187ee3468ee386fefd7ed40d99 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -42,7 +42,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: 'autorelease-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
             java-opts:
@@ -55,9 +55,10 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 
 - job-template:
@@ -85,12 +86,12 @@
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
         - releng-generate-p2pom
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
             settings: '{mvn-settings}'
@@ -98,26 +99,22 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - releng-update-p2composite-metadata:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            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)
@@ -130,9 +127,6 @@
 
     logrotate:
         daysToKeep: '7'
-        numToKeep: '-1'
-        artifactDaysToKeep: '-1'
-        artifactNumToKeep: '-1'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -168,7 +162,7 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'retox'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -191,9 +185,44 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            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}'
@@ -225,9 +254,10 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Node related
 
@@ -290,7 +320,7 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'renode'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -320,6 +350,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'