Add provide-maven-settings prebuilder to all templates

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

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 1a2872199415bf30b584fdec2b4e1ed2bd0904bf..fe3f190f53b7c76917a91c6b37e4e96050caccc2 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -7,8 +7,8 @@
     # and deploy artifacts to Nexus.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_merge
@@ -43,18 +43,19 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS -Dmerge'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs