X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=09d589e82a2524b37a555dc8e8becfce06b49e97;hb=fa80c75681cac5170c8a8b4c648abc8d6a0de9fa;hp=ce39d849c2a906cb7ab8750f9c434664b7b9ccd3;hpb=6e12ad9b74d45955d5ac5c4ae01e6ccd75fdf5a5;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index ce39d849c..09d589e82 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -44,9 +44,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/beryllium'
+            branch: 'stable/boron'
         - integration-distribution-stream:
-            stream: 'beryllium'
+            stream: 'boron'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -56,12 +56,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-beryllium.txt'
+            stream-test-plan: '{project}-{functionality}-boron.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-            # TODO: Switch to openjdk8 from Boron on.
+            jdkversion: 'openjdk8'
 
     scm:
         - integration-gerrit-scm:
@@ -80,6 +79,7 @@
 
     triggers:
         - integration-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/test'
             branch: 'master'
             pattern: 'csit/suites/{project}/**'
@@ -104,10 +104,11 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
@@ -188,6 +189,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -217,8 +219,8 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
@@ -298,6 +300,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -326,9 +329,113 @@
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
+          - title: '{03-plot-title}'
+            yaxis: '{03-plot-yaxis}'
+            group: '{03-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            series:
+              - file: '{03-plot-data-file}'
+                inclusion-flag: '{03-inclusion-flag}'
+                exclude: '{03-exclude-value}'
+                format: csv
+          - title: '{04-plot-title}'
+            yaxis: '{04-plot-yaxis}'
+            group: '{04-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            series:
+              - file: '{04-plot-data-file}'
+                inclusion-flag: '{04-inclusion-flag}'
+                exclude: '{04-exclude-value}'
+                format: csv
+          - title: '{05-plot-title}'
+            yaxis: '{05-plot-yaxis}'
+            group: '{05-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            series:
+              - file: '{05-plot-data-file}'
+                inclusion-flag: '{05-inclusion-flag}'
+                exclude: '{05-exclude-value}'
+                format: csv
+          - title: '{06-plot-title}'
+            yaxis: '{06-plot-yaxis}'
+            group: '{06-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            series:
+              - file: '{06-plot-data-file}'
+                inclusion-flag: '{06-inclusion-flag}'
+                exclude: '{06-exclude-value}'
+                format: csv
+          - title: '{07-plot-title}'
+            yaxis: '{07-plot-yaxis}'
+            group: '{07-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            series:
+              - file: '{07-plot-data-file}'
+                inclusion-flag: '{07-inclusion-flag}'
+                exclude: '{07-exclude-value}'
+                format: csv
+          - title: '{08-plot-title}'
+            yaxis: '{08-plot-yaxis}'
+            group: '{08-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            series:
+              - file: '{08-plot-data-file}'
+                inclusion-flag: '{08-inclusion-flag}'
+                exclude: '{08-exclude-value}'
+                format: csv
+          - title: '{09-plot-title}'
+            yaxis: '{09-plot-yaxis}'
+            group: '{09-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            series:
+              - file: '{09-plot-data-file}'
+                inclusion-flag: '{09-inclusion-flag}'
+                exclude: '{09-exclude-value}'
+                format: csv
+          - title: '{10-plot-title}'
+            yaxis: '{10-plot-yaxis}'
+            group: '{10-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            series:
+              - file: '{10-plot-data-file}'
+                inclusion-flag: '{10-inclusion-flag}'
+                exclude: '{10-exclude-value}'
+                format: csv
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
@@ -350,9 +457,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/beryllium'
+            branch: 'stable/boron'
         - integration-distribution-stream:
-            stream: 'beryllium'
+            stream: 'boron'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -362,12 +469,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-beryllium.txt'
+            stream-test-plan: '{project}-{functionality}-boron.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-            # TODO: Switch to openjdk8 from Boron on.
+            jdkversion: 'openjdk8'
 
     scm:
         - integration-gerrit-scm:
@@ -386,6 +492,7 @@
 
     triggers:
         - integration-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/test'
             branch: 'master'
             pattern: 'csit/suites/{project}/**'
@@ -411,10 +518,11 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
@@ -496,6 +604,120 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
+            email-prefix: '[{project}]'
+        - plot:
+          - title: '{01-plot-title}'
+            yaxis: '{01-plot-yaxis}'
+            group: '{01-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            series:
+              - file: '{01-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+          - title: '{02-plot-title}'
+            yaxis: '{02-plot-yaxis}'
+            group: '{02-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            series:
+              - file: '{02-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+        - integration-csit-archive-build
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
+
+- job-template:
+    name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-robot-2c-2g
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-scope:
+            controller-scope: '{scope}'
+        - integration-controller-features:
+            controller-features: 'odl-jolokia,{install-features}'
+        - integration-test-options:
+            test-options: '{robot-options}'
+        - integration-stream-test-plan:
+            stream-test-plan: '{project}-{functionality}-{stream}.txt'
+        - integration-test-plan:
+            test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
+
+    scm:
+        - integration-gerrit-scm:
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+        - integration-jclouds-controller-docker:
+            controller-image: '{controller-image}'
+            controller-vms: 3
+            docker-image: '{docker-image}'
+            docker-vms: 1
+
+    triggers:
+        - integration-csit-{install}:
+            jobs: '{trigger-jobs}'
+
+    builders:
+        - integration-copy-ssh-keys
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
+        - integration-configure-clustering
+        - integration-start-cluster-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -525,8 +747,8 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
@@ -607,12 +829,13 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
-            num-builds: '5400'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
@@ -625,7 +848,7 @@
           - title: '{02-plot-title}'
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
-            num-builds: '5400'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
@@ -635,9 +858,113 @@
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
+          - title: '{03-plot-title}'
+            yaxis: '{03-plot-yaxis}'
+            group: '{03-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            series:
+              - file: '{03-plot-data-file}'
+                inclusion-flag: '{03-inclusion-flag}'
+                exclude: '{03-exclude-value}'
+                format: csv
+          - title: '{04-plot-title}'
+            yaxis: '{04-plot-yaxis}'
+            group: '{04-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            series:
+              - file: '{04-plot-data-file}'
+                inclusion-flag: '{04-inclusion-flag}'
+                exclude: '{04-exclude-value}'
+                format: csv
+          - title: '{05-plot-title}'
+            yaxis: '{05-plot-yaxis}'
+            group: '{05-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            series:
+              - file: '{05-plot-data-file}'
+                inclusion-flag: '{05-inclusion-flag}'
+                exclude: '{05-exclude-value}'
+                format: csv
+          - title: '{06-plot-title}'
+            yaxis: '{06-plot-yaxis}'
+            group: '{06-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            series:
+              - file: '{06-plot-data-file}'
+                inclusion-flag: '{06-inclusion-flag}'
+                exclude: '{06-exclude-value}'
+                format: csv
+          - title: '{07-plot-title}'
+            yaxis: '{07-plot-yaxis}'
+            group: '{07-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            series:
+              - file: '{07-plot-data-file}'
+                inclusion-flag: '{07-inclusion-flag}'
+                exclude: '{07-exclude-value}'
+                format: csv
+          - title: '{08-plot-title}'
+            yaxis: '{08-plot-yaxis}'
+            group: '{08-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            series:
+              - file: '{08-plot-data-file}'
+                inclusion-flag: '{08-inclusion-flag}'
+                exclude: '{08-exclude-value}'
+                format: csv
+          - title: '{09-plot-title}'
+            yaxis: '{09-plot-yaxis}'
+            group: '{09-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            series:
+              - file: '{09-plot-data-file}'
+                inclusion-flag: '{09-inclusion-flag}'
+                exclude: '{09-exclude-value}'
+                format: csv
+          - title: '{10-plot-title}'
+            yaxis: '{10-plot-yaxis}'
+            group: '{10-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            series:
+              - file: '{10-plot-data-file}'
+                inclusion-flag: '{10-inclusion-flag}'
+                exclude: '{10-exclude-value}'
+                format: csv
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
@@ -678,12 +1005,16 @@
             description: 'Openstack version to use with devstack'
         - string:
             name: ODL_ML2_DRIVER_REPO
-            default: 'https://github.com/openstack/networking-odl'
+            default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
-            name: ODL_ML2_VERSION
-            default: '{odl-ml2-version}'
+            name: ODL_ML2_BRANCH
+            default: '{odl-ml2-branch}'
             description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ML2_DRIVER_VERSION
+            default: '{odl-ml2-driver-version}'
+            description: 'Mode of networking-odl (v1 or v2)'
         - string:
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
@@ -704,6 +1035,10 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -720,7 +1055,7 @@
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
@@ -743,10 +1078,11 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
@@ -787,16 +1123,24 @@
             description: 'Openstack version to use with devstack'
         - string:
             name: ODL_ML2_DRIVER_REPO
-            default: 'https://github.com/openstack/networking-odl'
+            default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
-            name: ODL_ML2_VERSION
-            default: '{odl-ml2-version}'
+            name: ODL_ML2_BRANCH
+            default: '{odl-ml2-branch}'
             description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ML2_DRIVER_VERSION
+            default: '{odl-ml2-driver-version}'
+            description: 'Mode of networking-odl (v1 or v2)'
         - string:
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_HAPROXY_FOR_NEUTRON
             default: '{enable-haproxy}'
@@ -813,6 +1157,11 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
+
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -829,7 +1178,7 @@
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
@@ -853,10 +1202,11 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
@@ -864,10 +1214,11 @@
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{stream}'
+    name: '{project}-patch-test-{feature}-{stream}'
 
     project-type: maven
     node: centos7-java-builder-2c-8g
+    concurrent: true
     jdk: '{jdk}'
 
     logrotate:
@@ -885,6 +1236,10 @@
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url
+        - string:
+            name: feature
+            default: 'all'
+            description: 'Specific feature test for patch'
 
     scm:
         - integration-gerrit-scm:
@@ -900,10 +1255,12 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-{project}'
+                    comment-contains-value: 'test-{project}-all'
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-{project}-{feature}'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -926,7 +1283,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '{project}/pom.xml'
             goals: 'clean install dependency:tree -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
@@ -937,7 +1294,7 @@
             global-settings-type: cfp
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install dependency:tree -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -957,4 +1314,8 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
+
+
+