X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fdistribution.yaml;h=04e9854f6778d9614aba4e8b2d0b58cdcdd874c5;hb=refs%2Fchanges%2F12%2F41412%2F1;hp=b2a6db8fc962e887a8d1d037d33d640e588d21e4;hpb=5e19d8ec0990ea677952e4e873374db76467d064;p=releng%2Fbuilder.git

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index b2a6db8fc..04e9854f6 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,7 +17,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:
@@ -26,6 +30,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - reverse:
@@ -33,15 +39,19 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+        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 +60,5 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - archive-build:
+            maven-version: '{mvn33}'