X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fdistribution.yaml;h=dfd1c5db2f01d3a75b7ae121fbce868ca52627d9;hb=dcb41f639bc14ea0db28f09ff3a4516892ab5d72;hp=a6067b9808698457485d9134fc13250731bd245c;hpb=2074d6c606284db9e707000451ca3c131323a0f8;p=releng%2Fbuilder.git

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index a6067b980..dfd1c5db2 100644
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -1,5 +1,9 @@
 - job-template:
-    name: 'PROJECT-distribution-{stream}'
+    name: 'PROJECT_SHORTNAME-distribution-{stream}'
+
+    # Required variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_merge
@@ -13,19 +17,16 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -33,15 +34,19 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        goals: 'clean install -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'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'integration-distribution-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     publishers:
         - email-notification:
@@ -50,3 +55,5 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - archive-build:
+            maven-version: '{mvn33}'