From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 9 Sep 2015 14:18:14 +0000 (+0000)
Subject: Merge "Add provide-maven-settings prebuilder to all templates"
X-Git-Tag: release/beryllium~557
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=78ef38d674e14f387776728c5688fbee687c0f46;hp=99aa1a6b7147c00e7110294165af14254650c1b1;p=releng%2Fbuilder.git

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

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 21a5111cf..6ad3da0c7 100644
--- 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 ca13f8add..39a23f265 100644
--- 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 4a9398c2d..0ee102c71 100644
--- 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 20127aad6..acd4dbf66 100644
--- 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 bae96fa14..39dc2d68d 100644
--- 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 b5f2243d9..b1cdd64f3 100644
--- 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 7b01f1d4c..33dc8886f 100644
--- 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'