Add JENKINS_SETTINGS variable to handle project-settings

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

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 334d41674973455bfc0bdb27dbe1dbe9c39f8df5..2061221d2a5c0adf4eda9bdac1cb58a7c5fe9404 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -50,7 +50,7 @@
         root-pom: 'POM'
         goals: 'MAVEN_GOALS -Dmerge'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
     reporters: