Merge "Move maven repo override"

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index d7ef840230961afb2241fb0e2d137887b9e78f1b..b7815c7fc5d01c46c165cb33957e1070e7f6999e 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -2,6 +2,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
-MVN_GOALS: clean install -Pintegrationtests
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
+MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 5f8297b827066bfad4561e87eddd87f03e652b36..eeb78bd66c07af82579e2fbcceebaa35f0738ca9 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -96,9 +96,9 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -Pintegrationtests -Dstream={stream}'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dstream={stream}'
             java-opts:
-                - '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+                - '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{netconf-settings}'
             global-settings: '{odl-global-settings}'
 
@@ -161,8 +161,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests -Dmerge -Dstream={stream}'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dmerge -Dstream={stream}'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
         post-step-run-condition: UNSTABLE
@@ -260,8 +260,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
 
@@ -388,8 +388,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
 
@@ -445,8 +445,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests -Dsonar'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dsonar'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'