Merge "Add support for configplan"

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
index 38c8d798ae5d5af025909937ea1269f1c5e0e6a5..3f46582899f64d36e5a5022110329ba55c38cbd5 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -10,7 +10,7 @@
 ##############################################################################
 
 NEXUSURL=https://nexus.opendaylight.org/content/repositories/
-VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
+VERSION=`grep -m2 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }'`
 if [ "x${VERSION}" == "x" ]; then
     echo "Lithium or sooner, different path needs to be searched."
     VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 42b6a4cca39720362f9444f53cfb85f0eba412c4..13b7684f9e84d77de2b4f1d74f351bf06b1b73b2 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -28,7 +28,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
@@ -65,7 +65,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
@@ -103,7 +103,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
@@ -119,5 +119,5 @@
     build-node: centos7-java-builder-4c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 106ef7ce964ec120ce189ddf1fb089c6b6d02c30..65904b2c7e75602f2a3d7f6e6aecc95e46fe5f4e 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'controller-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
@@ -63,7 +63,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'controller-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
@@ -99,7 +99,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'controller-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
@@ -114,5 +114,5 @@
     project-name: 'controller'
     branch: master
     mvn-settings: 'controller-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index b90746d6570b49d312a5cc0576cc75c1d838ca8c..9d001bf97d0229cfdf0e57a000e21e8a7eb0180d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
@@ -59,7 +59,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
@@ -90,7 +90,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
@@ -104,5 +104,5 @@
     project-name: 'groupbasedpolicy'
     branch: 'master'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 397cda5e4e38c9e8921a3cfe7d1586c97b47acdb..56f8ddf9bbd003561e93cf9e2ea3c05b042ff26b 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -160,6 +160,10 @@ if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
    exit
 fi
 
+echo "Lets's take the karaf thread dump"
+KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_before.log
+
 echo "Locating test plan to use..."
 testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
 if [ ! -f "${testplan_filepath}" ]; then
@@ -184,6 +188,10 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 # FIXME: Sort (at least -v) options alphabetically.
 
+echo "Lets's take the karaf thread dump again"
+KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_after.log
+
 echo "Killing ODL and fetching Karaf log..."
 set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 0debe1be4652b13c97be5daf9d16a9669538c536..2e39579ad916d6c1f9c034f9f1f1465ce9252ba4 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -85,6 +85,9 @@ for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
+    echo "Lets's take the karaf thread dump"
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log
 done
 
 echo "Generating mininet variables..."
@@ -121,6 +124,9 @@ set +e  # We do not want to create red dot just because something went wrong whi
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
+    echo "Lets's take the karaf thread dump again"
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log
     echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index ce39d849c2a906cb7ab8750f9c434664b7b9ccd3..93c8c9b2c3f8fdb4dd3c2bd1d55a16fd9ff445e2 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -797,6 +797,10 @@
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_HAPROXY_FOR_NEUTRON
             default: '{enable-haproxy}'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 97f2df947d03867ada7528bb9219a21009fd5112..4c3b9d5040f8b1b19d9c0001f955781776fcaa7b 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
@@ -59,7 +59,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
@@ -90,7 +90,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
@@ -104,5 +104,5 @@
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 915dc48648acee611a04a85a908a1d49c96fba31..ceeb83cc6aa625777db7ee223368be3087071672 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -27,7 +27,7 @@
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -59,7 +59,7 @@
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -90,7 +90,7 @@
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -104,5 +104,5 @@
     project-name: 'lacp'
     branch: 'master'
     mvn-settings: 'lacp-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 0453c377ae5f753f7122d1a7ef5ee78ce14283f0..e7cc9b19cdc3fa27eab17009b8b7191c92b08392 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -60,7 +60,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -93,7 +93,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -108,5 +108,5 @@
     project-name: 'lispflowmapping'
     branch: 'master'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
index 2bc16567e3b45591308976b00dcbf114a3661c6b..8d27a9ffd023c3a4bc6bd21f9254e7757e96016c 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
@@ -2,6 +2,7 @@
     name: mdsal-csit-periodic-dsbenchmark-beryllium
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'mdsal'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index e4307254e840614c2b5d970fd57e182deb264a9c..4228bcdedbfcd4b31c34bb8868d9ea6594e6b16c 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -59,7 +59,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -73,5 +73,5 @@
     project-name: 'mdsal'
     branch: 'master'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 28aac6ca304a1731818af4744713847c0bdbca04..9f8ff0953be0424f3bb651b441625ccbcaac3f09 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'netconf-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
+    mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
@@ -65,7 +65,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'netconf-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
+    mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
@@ -79,5 +79,5 @@
     project-name: 'netconf'
     branch: 'master'
     mvn-settings: 'netconf-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
+    mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index f60426cea7b49b8c170ee13ade787132d3d06308..f4a4d8d76b1790c876d2fd4ef4cbd9440df640d8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -35,6 +35,8 @@
 
     enable-haproxy: 'yes'
 
+    public-bridge: 'br-ex'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
new file mode 100644 (file)
index 0000000..f06abf4
--- /dev/null
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -0,0 +1,41 @@
+- project:
+    name: netvirt-vpnservice-3node-csit-openstack-integration
+    jobs:
+        - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
+
+    # The project name
+    project: 'netvirt-vpnservice'
+
+    # The project name
+    functionality: 'openstack'
+
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'stable/mitaka'
+            odl-ml2-version:  'stable/mitaka'
+        - liberty:
+            openstack-branch: 'stable/liberty'
+            odl-ml2-version:  'stable/liberty'
+
+    openstack-vms: 4
+
+    install-features: 'odl-netvirt-openstack'
+
+    schedule: 'H H * * *'
+
+    odl-enable-l3: 'yes'
+
+    enable-haproxy: 'yes'
+
+    public-bridge: 'br-ex'
+
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
+
+    tenant-network-type: 'vxlan'

diff --git a/jjb/netvirt/netvirt-vpnservice-patch-test.yaml b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml
new file mode 100644 (file)
index 0000000..295b81b
--- /dev/null
+++ b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml
@@ -0,0 +1,15 @@
+- project:
+    name: netvirt-vpnservice-patch-test
+    jobs:
+        - '{project}-patch-test-{stream}'
+
+    # The project name
+    project: 'netvirt-vpnservice'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jdk: 'openjdk8'
+            csit-list: >
+                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream}
\ No newline at end of file

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index a745fb54453d6aa3345f31d9e283bd5e319a9888..5f4b38a1f792bcc15832941e05079c5b5fd63fcf 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -73,5 +73,5 @@
     project-name: 'next'
     branch: 'master'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
index edadb6148fe2b3dc96e0f74fb5f3c29ba9380957..24a8ca1158c6225e863a020795e5b20eb48f0aa3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
@@ -21,7 +21,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
+    install-features: 'odl-openflowplugin-flow-services-ui-he,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23@hours --escape space:@'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
index 44a391e60c9b0ec62d70e86b99bdf79d88bb0ee8..e5378a76982a691c2e1ad8e48d87aa474f6ccb98 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
@@ -21,7 +21,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
+    install-features: 'odl-openflowplugin-flow-services-ui-li,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23@hours --escape space:@'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
index 62bf28e811fd4c9c9dfbbf1dc8c4f388895ccd1c..46073b52ff950ff5c0c2e232fcf9fca8309139ce 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
@@ -21,7 +21,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23@hours --escape space:@'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 21a34ff88442a8b5f5d3ebdcaebe4bdf1659e53d..38582d2d04ec26e1ce8f4345a4db15382537fd76 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -21,7 +21,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23@hours --escape space:@'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index a2f24dbeb43c25908384f113a31650740560df76..46b2dc2eca04895974d64c32a62f00b6ff38f690 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
@@ -59,7 +59,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
@@ -91,7 +91,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
@@ -105,5 +105,5 @@
     project-name: 'openflowplugin'
     branch: 'master'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 867c502463732fb8da89ae477eddc1235f9c6875..f4bb10dad3da73ce03dfe5646cf0bae8d56bf703 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -285,7 +285,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -VB -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -354,7 +354,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -VB -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -456,7 +456,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -VB -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -516,7 +516,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -VB -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -690,7 +690,7 @@
             settings-file: '{mvn-settings}'
         - maven-target:
             maven-version: '{mvn-version}'
-            goals: '{mvn-goals} -VB -Djenkins -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '{mvn-opts}'
             settings: '{mvn-settings}'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 673d3367f4c4f0158afcf7537b22bc10054fc863..97edf52ca87a6a3c8c10853de95d7026cbb91dbd 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -27,7 +27,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -59,7 +59,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -91,7 +91,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -105,5 +105,5 @@
     project-name: 'sdninterfaceapp'
     branch: 'master'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 8c93484b1a844da1d046ff911397a504c5bae1a8..2e9a387e8935434bb0b1e8ced9851c9ee757da99 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -28,7 +28,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tcpmd5-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
@@ -60,7 +60,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tcpmd5-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
@@ -92,7 +92,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tcpmd5-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
@@ -106,5 +106,5 @@
     project-name: 'tcpmd5'
     branch: 'master'
     mvn-settings: 'tcpmd5-settings'
-    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 9bb696b61509a75802dcb7856a3e5fc748735568..5535134a0e016590a1b8a7705a7e731fdfe0123c 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -28,7 +28,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
@@ -60,7 +60,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
@@ -91,7 +91,7 @@
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
@@ -105,5 +105,5 @@
     project-name: 'tsdr'
     branch: 'master'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'