Merge "Update spectrometer jobs"

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

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index b2a6db8fc962e887a8d1d037d33d640e588d21e4..57c2b224e58e7f5816387361b249dca4752f799a 100644 (file)
--- 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:
@@ -34,11 +38,14 @@
 
     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 -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}'