From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 11 Sep 2015 02:10:07 +0000 (-0400)
Subject: Fix provide-maven-settings using yangtools-settings
X-Git-Tag: release/beryllium~547
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=12f5109e5c9546630728a0a95c8debbafee747e1;p=releng%2Fbuilder.git

Fix provide-maven-settings using yangtools-settings

Change-Id: I769e8bb8df4efe8b6b7a20773e1a804bd6567da2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 6ad3da0c7..9639225a5 100644
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -34,7 +34,7 @@
         - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 39a23f265..ad9998ace 100644
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -44,7 +44,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index 0ee102c71..b4010f508 100644
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -40,7 +40,7 @@
         - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index acd4dbf66..5553424f9 100644
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -48,7 +48,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 39dc2d68d..4873f7cae 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -46,7 +46,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index b1cdd64f3..afcfe9a3a 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -37,7 +37,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 33dc8886f..9391d7111 100644
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -57,7 +57,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'POM'