From c1c66c244c0a071b6291b3cd09bb5ccaf2667a2d Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 5 Feb 2016 21:28:03 -0500 Subject: [PATCH] Disable distribution-check job in Lithium and Helium streams Change-Id: I271821b2a2e2ca1ac2c7f930ca04602829b646ec Signed-off-by: Thanh Ha --- jjb/aaa/aaa.cfg | 2 ++ jjb/alto/alto.cfg | 1 + jjb/bgpcep/bgpcep.cfg | 2 ++ jjb/capwap/capwap.cfg | 1 + jjb/controller/controller.cfg | 2 ++ jjb/coretutorials/coretutorials.cfg | 1 + jjb/defense4all/defense4all.cfg | 2 ++ jjb/didm/didm.cfg | 1 + jjb/dlux/dlux.cfg | 2 ++ jjb/docs/docs.cfg | 2 ++ jjb/groupbasedpolicy/groupbasedpolicy.cfg | 2 ++ jjb/iotdm/iotdm.cfg | 1 + jjb/l2switch/l2switch.cfg | 2 ++ jjb/lacp/lacp.cfg | 1 + jjb/lispflowmapping/lispflowmapping.cfg | 2 ++ jjb/neutron/neutron.cfg | 1 + jjb/nic/nic.cfg | 1 + jjb/odlparent/odlparent.cfg | 2 ++ jjb/openflowjava/openflowjava.cfg | 2 ++ jjb/openflowplugin/openflowplugin.cfg | 2 ++ jjb/ovsdb/ovsdb.cfg | 2 ++ jjb/packetcable/packetcable.cfg | 2 ++ jjb/persistence/persistence.cfg | 1 + jjb/reservation/reservation.cfg | 1 + jjb/sdninterfaceapp/sdninterfaceapp.cfg | 2 ++ jjb/sfc/sfc.cfg | 2 ++ jjb/snbi/snbi.cfg | 2 ++ jjb/snmp/snmp.cfg | 1 + jjb/snmp4sdn/snmp4sdn.cfg | 2 ++ jjb/sxp/sxp.cfg | 2 ++ jjb/tcpmd5/tcpmd5.cfg | 2 ++ jjb/topoprocessing/topoprocessing.cfg | 1 + jjb/tsdr/tsdr.cfg | 1 + jjb/ttp/ttp.cfg | 2 ++ jjb/usc/usc.cfg | 1 + jjb/vpnservice/vpnservice.cfg | 1 + jjb/vtn/vtn.cfg | 2 ++ jjb/yangtools/yangtools.cfg | 2 ++ 38 files changed, 61 insertions(+) diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg index ffcc93dde..6832b0d2a 100644 --- a/jjb/aaa/aaa.cfg +++ b/jjb/aaa/aaa.cfg @@ -10,7 +10,9 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: yangtools,controller diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg index 90531b5c8..68ce6b4b9 100644 --- a/jjb/alto/alto.cfg +++ b/jjb/alto/alto.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,yangtools,odlparent,l2switch diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg index 97f28382e..499324bf2 100644 --- a/jjb/bgpcep/bgpcep.cfg +++ b/jjb/bgpcep/bgpcep.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m DEPENDENCIES: odlparent,yangtools,controller,mdsal,tcpmd5 diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg index 124a1dcfa..4cbe57acb 100644 --- a/jjb/capwap/capwap.cfg +++ b/jjb/capwap/capwap.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg index f9ad7fc2e..0dd6f5295 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true DEPENDENCIES: yangtools,aaa diff --git a/jjb/coretutorials/coretutorials.cfg b/jjb/coretutorials/coretutorials.cfg index f47778a04..8d839df67 100644 --- a/jjb/coretutorials/coretutorials.cfg +++ b/jjb/coretutorials/coretutorials.cfg @@ -8,5 +8,6 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent,yangtools,controller JDKS: openjdk7,openjdk8 diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg index 7312628e7..e6a952724 100644 --- a/jjb/defense4all/defense4all.cfg +++ b/jjb/defense4all/defense4all.cfg @@ -8,8 +8,10 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent POM: dfapp/pom.xml diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg index 8d890570e..6cd39ac4d 100644 --- a/jjb/didm/didm.cfg +++ b/jjb/didm/didm.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg index 7bbe20d44..bfbd0bbaa 100644 --- a/jjb/dlux/dlux.cfg +++ b/jjb/dlux/dlux.cfg @@ -10,6 +10,8 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg index 7bbe20d44..bfbd0bbaa 100644 --- a/jjb/docs/docs.cfg +++ b/jjb/docs/docs.cfg @@ -10,6 +10,8 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg index f2ee3b25e..5183618cf 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg +++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false 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,yangtools,controller,openflowjava,openflowplugin,neutron,sfc,ovsdb diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg index d6476d495..1de3331e9 100644 --- a/jjb/iotdm/iotdm.cfg +++ b/jjb/iotdm/iotdm.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false DEPENDENCIES: controller,yangtools,odlparent,aaa diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg index b91001980..387aeac6a 100644 --- a/jjb/l2switch/l2switch.cfg +++ b/jjb/l2switch/l2switch.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg index 21dde05a7..19d3600f8 100644 --- a/jjb/lacp/lacp.cfg +++ b/jjb/lacp/lacp.cfg @@ -10,6 +10,7 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false 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,controller,openflowjava,openflowplugin,odlparent diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg index d1ba0edc1..60d6b6c14 100644 --- a/jjb/lispflowmapping/lispflowmapping.cfg +++ b/jjb/lispflowmapping/lispflowmapping.cfg @@ -11,7 +11,9 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,odlparent,yangtools,neutron diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg index c905a57ab..998ccf8a3 100644 --- a/jjb/neutron/neutron.cfg +++ b/jjb/neutron/neutron.cfg @@ -11,3 +11,4 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg index 8195f302a..c586932f2 100644 --- a/jjb/nic/nic.cfg +++ b/jjb/nic/nic.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,odlparent,vtn,yangtools,groupbasedpolicy diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg index 7bbe20d44..bfbd0bbaa 100644 --- a/jjb/odlparent/odlparent.cfg +++ b/jjb/odlparent/odlparent.cfg @@ -10,6 +10,8 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg index 92831127c..ca35d0450 100644 --- a/jjb/openflowjava/openflowjava.cfg +++ b/jjb/openflowjava/openflowjava.cfg @@ -10,7 +10,9 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: yangtools,controller diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg index 18bcf432d..7de5428b3 100644 --- a/jjb/openflowplugin/openflowplugin.cfg +++ b/jjb/openflowplugin/openflowplugin.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m DEPENDENCIES: yangtools,controller,openflowjava diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg index a6d3fde7b..8096530b1 100644 --- a/jjb/ovsdb/ovsdb.cfg +++ b/jjb/ovsdb/ovsdb.cfg @@ -10,8 +10,10 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron JOB_TEMPLATES: verify,merge,periodic,distribution,integration diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg index 3e89525f5..0b605b662 100644 --- a/jjb/packetcable/packetcable.cfg +++ b/jjb/packetcable/packetcable.cfg @@ -10,7 +10,9 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,yangtools diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg index 80c15af11..37efb4dd3 100644 --- a/jjb/persistence/persistence.cfg +++ b/jjb/persistence/persistence.cfg @@ -8,3 +8,4 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg index 2f144d842..2020e5eae 100644 --- a/jjb/reservation/reservation.cfg +++ b/jjb/reservation/reservation.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent,controller,yangtools,groupbasedpolicy diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg index 8b9213887..ea228b53e 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg +++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg @@ -10,8 +10,10 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r DEPENDENCIES: odlparent,bgpcep diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg index 8ab4e676a..dce68e3b6 100644 --- a/jjb/sfc/sfc.cfg +++ b/jjb/sfc/sfc.cfg @@ -10,8 +10,10 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg index 7bbe20d44..bfbd0bbaa 100644 --- a/jjb/snbi/snbi.cfg +++ b/jjb/snbi/snbi.cfg @@ -10,6 +10,8 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg index f174c82ae..5eb81ce3b 100644 --- a/jjb/snmp/snmp.cfg +++ b/jjb/snmp/snmp.cfg @@ -10,3 +10,4 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg index 08c8642e7..fa5f353e2 100644 --- a/jjb/snmp4sdn/snmp4sdn.cfg +++ b/jjb/snmp4sdn/snmp4sdn.cfg @@ -10,7 +10,9 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent,controller,yangtools diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg index 72fc254aa..11d8b08b2 100644 --- a/jjb/sxp/sxp.cfg +++ b/jjb/sxp/sxp.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false # 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,controller,yangtools,tcpmd5 diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg index bd5e53bba..3df432425 100644 --- a/jjb/tcpmd5/tcpmd5.cfg +++ b/jjb/tcpmd5/tcpmd5.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m DEPENDENCIES: odlparent,yangtools,controller diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg index c14853de4..55dc7fdfd 100644 --- a/jjb/topoprocessing/topoprocessing.cfg +++ b/jjb/topoprocessing/topoprocessing.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false DEPENDENCIES: controller,yangtools diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg index 6a6d38b75..28ce42489 100644 --- a/jjb/tsdr/tsdr.cfg +++ b/jjb/tsdr/tsdr.cfg @@ -10,5 +10,6 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false 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 diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg index 7bbe20d44..bfbd0bbaa 100644 --- a/jjb/ttp/ttp.cfg +++ b/jjb/ttp/ttp.cfg @@ -10,6 +10,8 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg index 1c309ab37..351e91984 100644 --- a/jjb/usc/usc.cfg +++ b/jjb/usc/usc.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk8,openjdk7 + distribution-check: false DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg index 36ecbdfd0..6df23fbb3 100644 --- a/jjb/vpnservice/vpnservice.cfg +++ b/jjb/vpnservice/vpnservice.cfg @@ -10,4 +10,5 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,yangtools,odlparent,openflowplugin,neutron diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg index 72df9f84b..e96ecc073 100644 --- a/jjb/vtn/vtn.cfg +++ b/jjb/vtn/vtn.cfg @@ -10,9 +10,11 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: controller,mdsal,neutron,odlparent,openflowplugin,ovsdb,yangtools 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 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/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg index c26bfb3c0..5ae554483 100644 --- a/jjb/yangtools/yangtools.cfg +++ b/jjb/yangtools/yangtools.cfg @@ -10,8 +10,10 @@ STREAMS: - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 + distribution-check: false - stable-helium: branch: stable/helium jdks: openjdk7 + distribution-check: false DEPENDENCIES: odlparent JOB_TEMPLATES: merge,periodic,distribution,integration,sonar -- 2.36.6