Use predictable maven-settings naming scheme

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

diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml
index c20911fffd4a77bb19ead297aea67d81b5d13f5d..0fc23c5e0483d0badab27f7471ca5736a79dbf32 100644 (file)
--- a/jjb-templates/periodic.yaml
+++ b/jjb-templates/periodic.yaml
@@ -44,16 +44,18 @@
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{JENKINS_SETTINGS}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS -V -B -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{JENKINS_SETTINGS}'
-        global-settings: '{odl-global-settings}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs