Update project dependencies according to offset

- Offset-0 projects should depend only on offset-0
- Offset-1 projects should depend only on offset-0 and offset-1
- Offset-2 projects should depend only on offset-1 and offset-2
- Non-SimRel participating offsets depend on no offsets

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index e1db8de96d473c5fba6bd821312c0db5b8e7b745..533bd018a96dfff7a867a1244aad7e2ded490622 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},l2switch-merge-{stream}'
-    email-upstream: '[alto] [controller] [yangtools] [odlparent] [l2switch]'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
-

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 000c837432c9b35ac3a2c68fd2723a21656f0421..0f6aec251841ab54cd6214268e4ed6413a98d3c4 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -36,7 +36,6 @@
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[armoury] [odlparent] [yangtools] [controller] [mdsal]'
+    dependencies: ''
+    email-upstream: '[armoury]'
     archive-artifacts: ''
-

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 9b5787ec17c43ce9270d62e6a57719f074899b3d..40e656462ad5c1e56b36ec3e8fd62c95b939e75f 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -27,7 +27,6 @@
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[atrium] [odlparent] [yangtools] [controller] [mdsal]'
+    dependencies: ''
+    email-upstream: '[atrium]'
     archive-artifacts: ''
-

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index dc1c70dc03b5f1fb1da278a15dd97c5d41bbccdb..573554f793e3d29a6d247133830721f47a8fddfb 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'capwap-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[capwap] [controller] [yangtools] [odlparent]'
+    dependencies: ''
+    email-upstream: '[capwap]'
     archive-artifacts: ''
-

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index c52c687272fd1c130b235c9e2b1e8c9d852a6ea0..a807485e122203c3e3b98e7cd5a19a3b012291ed 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -27,7 +27,6 @@
     mvn-settings: 'cardinal-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [controller] [yangtools] [odlparent] [openflowplugin] [iotdm] [sfc]'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
-

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 64baa51a98140a533341dc26d14ee3c05a2f9ebc..deee3bb3eb0abc4589fa8c5efb356a0da943fca2 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'centinel-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[centinel] [odlparent] [controller] [yangtools]'
+    dependencies: ''
+    email-upstream: '[centinel]'
     archive-artifacts: ''
-

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 5bb28065e0e41e5e369e2b8d398ecdb11a534ecd..f65ddffe86cef58764f508b54b445f70a5dc3f90 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -41,7 +41,6 @@
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coretutorials] [odlparent] [yangtools] [controller]'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
     archive-artifacts: ''
-

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 039a1540a00110ee3ff6fea8438939f028ea9d03..9d34068f72e970126f07fb5197634f3ba5dde7b5 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'didm-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[didm] [odlparent]'
+    dependencies: ''
+    email-upstream: '[didm]'
     archive-artifacts: ''
-

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 25d864ad15931ba569e382c2795d867148446baf..19f0f8e923bbd6666308aa73d201866fba3482af 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -34,7 +34,6 @@
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[discovery] [odlparent]'
+    dependencies: ''
+    email-upstream: '[discovery]'
     archive-artifacts: ''
-

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 4c068dcd00fb27aefe1a962c7b5bf256dab7b631..71741bb4d56576b6d8f7d0454505bb2776422779 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[faas] [controller] [yangtools] [odlparent]'
+    dependencies: ''
+    email-upstream: '[faas]'
     archive-artifacts: ''
-

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index e3a7aac8b248c1b86b1e4121c9285461b4026493..70138b94e129d2e65fa9add063fa46a3691e4eac 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -42,7 +42,6 @@
     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-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[groupbasedpolicy] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
-

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index adfe39e3024c79b1630cea0ca8f75f85d1285136..eab84aa58ae237e7241535c7db8cd350608af719 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -27,7 +27,6 @@
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},netconf-merge-{stream}'
-    email-upstream: '[vbd] [odlparent] [yangtools] [controller] [mdsal] [netconf]'
+    dependencies: ''
+    email-upstream: '[vbd]'
     archive-artifacts: ''
-

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index c099d6adb137dad7fa7d88e572e1c619e0aa913d..9989c476ab3b0d60601e504d578fcf896db5447f 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -43,7 +43,6 @@
     mvn-settings: 'iotdm-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[iotdm] [controller] [yangtools] [odlparent] [aaa]'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
-

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index a82b454f7c74d31369f81042bd43c27f759b6a14..656883c159748e8153e3b45db86994e9952de6a6 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -42,7 +42,6 @@
     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-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[lacp] [yangtools] [controller] [openflowjava] [openflowplugin] [odlparent]'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
-

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 07d33297877adbb9c176cfde3752e94fd653fa9d..fb2b9d4be7fc5baaa5199036028adf7124774a82 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'messaging4transport-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'yangtools-merge-{stream},aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[messaging4transport] [yangtools] [aaa] [controller] [odlparent]'
+    dependencies: ''
+    email-upstream: '[messaging4transport]'
     archive-artifacts: ''
-

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index a9de720fe18218bbf4f113ab9a63871babe17f11..cbbd383bac8e427656d58710bbd6d7b52f1d8acb 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -27,7 +27,6 @@
     mvn-settings: 'natapp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [controller] [yangtools] [odlparent] [openflowplugin]'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
-

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 375af502e86d6e2c5576842f85672f6442910987..cc359dedf17ea84b2cdda4b1ab090507f8f3a99a 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'nemo-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[nemo] [controller] [yangtools] [odlparent]'
+    dependencies: ''
+    email-upstream: '[nemo]'
     archive-artifacts: ''
-

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 15c3fc96909dd03a7207ee48a6e8b33a93d3e3c4..ca65bdd2ff60098ebabe9a4c0cc63620d33f3c36 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'netide-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
-    email-upstream: '[netide] [odlparent] [yangtools] [controller] [openflowjava]'
+    dependencies: 'openflowjava-merge-{stream}'
+    email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
-

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 2a6b48f7d9b37c2eae4db39b63253275860d7012..294aae08856a8d8bf52590dfe49da101d58bd7d2 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -41,6 +41,6 @@
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},neutron-merge-{stream},odlparent-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netvirt] [controller] [neutron] [odlparent] [openflowjava] [openflowplugin] [ovsdb] [sfc] [yangtools]'
+    dependencies: 'neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 09cb33e3a71a26d50c7d7736fd8b3206fbe8a428..7778f4c679594e6b9401780d86daa032c48a0213 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'next-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[next] [odlparent] [controller] [yangtools]'
+    dependencies: ''
+    email-upstream: '[next]'
     archive-artifacts: ''
-

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index c7ca0dbd0b54c0248439c6bb15106f0fb175016c..22b9033ab2203ce90a7aa64a76a86a841ea70681 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'nic-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},vtn-merge-{stream},yangtools-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [controller] [odlparent] [vtn] [yangtools] [groupbasedpolicy]'
+    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
-

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 3b5a13a1c6463f7eb372795635847bde9cd3d0f7..767bacb0b73c8b143887ff3540ab898e8ee4c38b 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},netconf-merge-{stream}'
-    email-upstream: '[of-config] [controller] [yangtools] [odlparent] [netconf]'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
-

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 4ae5c6495eb4b40d04183d750517d32c353b1dcf..aa88491cb7957f888e3113bcd483132413134df0 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[circuitsw] [odlparent] [yangtools] [controller] [openflowplugin]'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
     archive-artifacts: ''
-

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index fe8cc4066ea03eeed78b442882e4f1fb26423c19..03f12373270ec74b21a83662f7c85d76023f16d2 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -45,6 +45,6 @@
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    dependencies: ''
+    email-upstream: '[ovsdb]'
     archive-artifacts: ''

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index f51fbf057001f3789e461bd937c4ca2289251684..8ead4af9d1476734c50730e025c9690cf7e3e3dd 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'packetcable-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[packetcable] [odlparent] [controller] [yangtools]'
+    dependencies: ''
+    email-upstream: '[packetcable]'
     archive-artifacts: ''
-

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 3531af8f170793d7b3445d1bf2925e8c5c7d9b16..a2c36a84c211d1008b032763106b0aa45bc4c076 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -44,7 +44,6 @@
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[persistence] [odlparent]'
+    dependencies: ''
+    email-upstream: '[persistence]'
     archive-artifacts: ''
-

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 81aee5f51e71dea6e38dcda53bd09e90969b3ced..f099f2e748516f9a6f69da85b1754e4859aa348f 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[reservation] [odlparent] [controller] [yangtools] [groupbasedpolicy]'
+    dependencies: ''
+    email-upstream: '[reservation]'
     archive-artifacts: ''
-

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 187fef48c16e8df46f4c654254f372a9a047b4be..1f69048d8e49c593484f78f9af260e3e4a75b15c 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -43,7 +43,6 @@
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [odlparent] [bgpcep]'
+    dependencies: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
-

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 035c4d8403f7c4fc1765a22ecf8e91fb716cdcca..cab5eec62212e365793af4b7dfcc8b65190977d5 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [odlparent] [yangtools] [controller] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
-

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index ab470f91555bd999f4d6a4f37e8dabc5b1dc8354..4137a0b0750466297b1feeb1f5c230a2e739b639 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'snbi-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snbi] [odlparent]'
+    dependencies: ''
+    email-upstream: '[snbi]'
     archive-artifacts: ''
-

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 16609cf30ff2fdb6053237ef48e43df781d33030..103bd1505d72f248c845a24280f20a0aa3e687c5 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -34,7 +34,6 @@
     mvn-settings: 'toolkit-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[toolkit] [odlparent] [controller]'
+    dependencies: ''
+    email-upstream: '[toolkit]'
     archive-artifacts: ''
-

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 47c213887f6a8ac9c30ebc26c732eb8c163ec5e2..e6340fa1c7cec83ea45e28c85c32aec3d985be38 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -42,7 +42,6 @@
     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-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[tsdr] [odlparent]'
+    dependencies: ''
+    email-upstream: '[tsdr]'
     archive-artifacts: ''
-

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index b78440027ee54bf0913b588f8db873fd523bb0c8..9bb857b8bc54b470b6d4f11837d193272691a199 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'unimgr-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [ovsdb]'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index d6c38a04574861b36599a9f76be510b5d4fdfc12..464327141d2c5dadd98c7a0205aec33be6f25944 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'usecplugin-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin] [odlparent] [controller] [yangtools]'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
-

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 212e46210c485314ebb607bc6917c70e4229f376..4f4d010cde91cc4a2850e50aa58621df52f9c418 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -42,7 +42,6 @@
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[vpnservice] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+    dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
     archive-artifacts: ''
-

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 13709888c35ae474bb661f2fea250c8022999aed..79b96160316f015a81b8fb821cdf27c9b85d2a40 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -42,6 +42,6 @@
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},mdsal-merge-{stream},neutron-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[vtn] [controller] [mdsal] [neutron] [odlparent] [openflowplugin] [ovsdb] [yangtools]'
+    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
+    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2 manager/northbound/target/site/wsdocs/** manager/api/target/*-javadoc.jar manager/api/target/apidocs/** target/*-javadoc.jar target/apidocs/** manager/model/target/site/models/**'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 236086cc842e4e81b078e0e8d7613c0bbeb6b45c..beef82c0eac9e95d5e7c1e1735162be1be16749e 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -35,7 +35,6 @@
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[yang-push] [controller] [yangtools] [odlparent]'
+    dependencies: ''
+    email-upstream: '[yang-push]'
     archive-artifacts: ''
-