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 6ad3da0c7acdb18daaa84906caadc4d0647b2fad..9639225a52ccfc91e2f6f9ff4360cff4ec4babcd 100644 (file)
--- 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 39a23f26514b36649bf8938819211fb8d9f48969..ad9998ace5ae6219d046e9b79a647a32140049c7 100644 (file)
--- 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 0ee102c71bbf6ec642ca143222fdbf945dda1432..b4010f5081b16c9b860e97b259145f5c70b8074f 100644 (file)
--- 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 acd4dbf664d7479c24b40c4cbde60e5e9e58c651..5553424f97758ee9fce6a80e5c0da135829ecd1d 100644 (file)
--- 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 39dc2d68d8ef7238f4e6e517dc2f72a96aef40b2..4873f7cae31db94fc2343ec771694a128c8d4dde 100644 (file)
--- 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 b1cdd64f340d720047244b5238048b47f0860ff6..afcfe9a3a95884d5032aff8c917dcde456237845 100644 (file)
--- 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 33dc8886f68dd1087b3d95892f96255bb7aa6cd3..9391d71118ffb37cd15e7e4df6a65949442bae1b 100644 (file)
--- 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'