From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 12 Mar 2015 13:57:26 +0000 (-0400)
Subject: Fix integration using the wrong settings.xml user file
X-Git-Tag: release/lithium~353
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=33ad1dc3c6ee417f68f2e5cf3d90a798be17a529;p=releng%2Fbuilder.git

Fix integration using the wrong settings.xml user file

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

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index dc00a762a..1ca529d25 100644
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -74,7 +74,7 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{odlparent-settings}'
+        settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
         ignore-upstream-changes: true
 
@@ -132,7 +132,7 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{odlparent-settings}'
+        settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers: