Merge "Vagrant and start-up script updates for GBP image"

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

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index b2a6db8fc962e887a8d1d037d33d640e588d21e4..0d58aaf1e9ac88cd47c0c284955e76130f644a38 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,6 +38,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'