Merge "Add provide-maven-settings prebuilder to all templates"

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 21a5111cfaca1a8f0ada140c98949e7e2f3e9b25..6ad3da0c7acdb18daaa84906caadc4d0647b2fad 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -32,6 +32,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index ca13f8adde7965f30d4b917a438a5dfcb42f0bdf..39a23f26514b36649bf8938819211fb8d9f48969 100644 (file)
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -42,6 +42,9 @@
     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}'

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index 4a9398c2da8caa7be5f27be86464676b29622e4d..0ee102c71bbf6ec642ca143222fdbf945dda1432 100644 (file)
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -38,6 +38,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 20127aad670e588ae1420ae0bca38344a419e2b9..acd4dbf664d7479c24b40c4cbde60e5e9e58c651 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -46,6 +46,9 @@
     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}'

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index bae96fa14e42933e6b5e23ed37424ecf5e0420d5..39dc2d68d8ef7238f4e6e517dc2f72a96aef40b2 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -44,6 +44,9 @@
     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}'

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index b5f2243d93e4a056a013a5275cc51fea55fa32ab..b1cdd64f340d720047244b5238048b47f0860ff6 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -35,6 +35,9 @@
     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}'

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 7b01f1d4c6fed8d4dfcedae1d21997399cea5399..33dc8886f68dd1087b3d95892f96255bb7aa6cd3 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -55,6 +55,9 @@
     builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'POM'