From 30f651a1fc4515dda1e66f4b2f520502bcbd95bf Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 11 Oct 2017 14:32:42 +0200 Subject: [PATCH] Do not specify jre or jdk if default value applies This drop multiple lines which set openjdk8 as jre or jdk, similarly to ho karaf-version is not specified if karaf4 is to be used. Only Persistence project uses openjdk7. Lines setting jdks and maven cannot be dropped, as they constitute part of job name. Similarly to scope for CSIT. Change-Id: Ic575cb144d4e66ec3c18439984bcd517b6fc7879 Signed-off-by: Vratko Polak --- jjb/aaa/aaa-csit-authn.yaml | 3 --- jjb/aaa/aaa-csit-idmlite.yaml | 3 --- jjb/aaa/aaa-csit-keystone.yaml | 3 --- jjb/aaa/aaa-csit-tls.yaml | 3 --- jjb/aaa/aaa-patch-test.yaml | 3 --- jjb/aaa/aaa.yaml | 3 --- jjb/alto/alto-csit-setup.yaml | 3 --- jjb/alto/alto.yaml | 3 --- jjb/atrium/atrium.yaml | 3 --- jjb/autorelease/autorelease-projects.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml | 3 --- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 --- jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml | 3 --- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 --- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 --- jjb/bgpcep/bgpcep-patch-test.yaml | 3 --- jjb/bgpcep/bgpcep.yaml | 3 --- jjb/bier/bier-csit-basic.yaml | 3 --- jjb/bier/bier.yaml | 3 --- jjb/capwap/capwap-csit-ac.yaml | 3 --- jjb/capwap/capwap.yaml | 3 --- jjb/cardinal/cardinal.yaml | 3 --- jjb/centinel/centinel-csit-basic.yaml | 3 --- jjb/centinel/centinel.yaml | 3 --- jjb/coe/coe-csit-openstack.yaml | 2 -- jjb/coe/coe.yaml | 3 --- jjb/controller/controller-csit-akka1.yaml | 3 --- jjb/controller/controller-csit-clustering.yaml | 3 --- jjb/controller/controller-csit-cs-chasing-leader.yaml | 3 --- jjb/controller/controller-csit-cs-partnheal.yaml | 3 --- jjb/controller/controller-csit-ddb-expl-lead-movement.yaml | 3 --- jjb/controller/controller-csit-dnb-noloss.yaml | 3 --- jjb/controller/controller-csit-drb-partnheal.yaml | 3 --- jjb/controller/controller-csit-drb-precedence.yaml | 3 --- .../controller-csit-periodic-dsbenchmark-cluster.yaml | 3 --- jjb/controller/controller-csit-periodic-dsbenchmark.yaml | 3 --- jjb/controller/controller-csit-rest-cars-perf.yaml | 3 --- jjb/controller/controller-csit-rest-clust-cars-perf.yaml | 3 --- jjb/controller/controller.yaml | 3 --- jjb/coretutorials/coretutorials.yaml | 3 --- jjb/daexim/daexim-csit-basic.yaml | 2 -- jjb/daexim/daexim.yaml | 2 -- jjb/didm/didm-csit-discovery.yaml | 3 --- jjb/didm/didm.yaml | 3 --- jjb/dlux/dlux.yaml | 3 --- jjb/dluxapps/dluxapps-csit-yangman.yaml | 3 --- jjb/dluxapps/dluxapps.yaml | 3 --- jjb/eman/eman.yaml | 3 --- jjb/faas/faas.yaml | 3 --- jjb/federation/federation.yaml | 3 --- jjb/genius/genius-csit-genius.yaml | 3 --- jjb/genius/genius.yaml | 3 --- .../groupbasedpolicy-csit-1node-openstack.yaml | 3 --- jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml | 3 --- jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml | 3 --- jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml | 3 --- jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml | 3 --- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 3 --- jjb/honeycomb/vbd/vbd.yaml | 3 --- jjb/infrautils/infrautils.yaml | 3 --- .../distribution/distribution-csit-userfeatures.yaml | 5 ----- jjb/integration/distribution/distribution.yaml | 2 -- jjb/integration/integration-test-jobs.yaml | 4 ---- jjb/integration/integration4-templates.yaml | 3 +++ jjb/iotdm/iotdm-csit-basic.yaml | 3 --- jjb/iotdm/iotdm.yaml | 3 --- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 3 --- jjb/jsonrpc/jsonrpc.yaml | 3 --- jjb/l2switch/l2switch-csit-host-scalability-daily.yaml | 3 --- jjb/l2switch/l2switch-csit-scalability.yaml | 3 --- jjb/l2switch/l2switch-csit-switch.yaml | 3 --- jjb/l2switch/l2switch-patch-test.yaml | 3 --- jjb/l2switch/l2switch.yaml | 3 --- jjb/lacp/lacp-csit-lacp.yaml | 3 --- jjb/lacp/lacp.yaml | 3 --- jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml | 3 --- jjb/lispflowmapping/lispflowmapping-csit-performance.yaml | 3 --- jjb/lispflowmapping/lispflowmapping.yaml | 3 --- jjb/mdsal/mdsal-csit-bindingv1.yaml | 3 --- jjb/mdsal/mdsal.yaml | 3 --- jjb/messaging4transport/messaging4transport-csit-basic.yaml | 3 --- jjb/messaging4transport/messaging4transport.yaml | 3 --- jjb/natapp/natapp-csit-basic.yaml | 3 --- jjb/natapp/natapp.yaml | 3 --- jjb/nemo/nemo-csit-engine.yaml | 3 --- jjb/nemo/nemo.yaml | 3 --- jjb/netconf/netconf-cluster-stress.yaml | 3 --- jjb/netconf/netconf-clustering-scale.yaml | 3 --- jjb/netconf/netconf-clustering.yaml | 3 --- jjb/netconf/netconf-csit-callhome.yaml | 3 --- jjb/netconf/netconf-patch-test.yaml | 3 --- jjb/netconf/netconf-scale.yaml | 3 --- jjb/netconf/netconf-userfeatures.yaml | 3 --- jjb/netconf/netconf.yaml | 3 --- jjb/netide/netide-csit-basic.yaml | 3 --- jjb/netide/netide.yaml | 3 --- jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml | 3 --- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 6 ------ jjb/netvirt/netvirt-full-integration.yaml | 5 ----- jjb/netvirt/netvirt.yaml | 2 -- jjb/neutron/neutron.yaml | 3 --- jjb/next/next.yaml | 3 --- jjb/nic/nic-csit-basic.yaml | 3 --- jjb/nic/nic.yaml | 3 --- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 3 --- jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 3 --- jjb/ocpplugin/ocpplugin.yaml | 3 --- jjb/odlparent/odlparent.yaml | 3 --- jjb/of-config/of-config-csit-basic.yaml | 3 --- jjb/of-config/of-config.yaml | 3 --- jjb/ofextensions/circuitsw/circuitsw.yaml | 3 --- jjb/openflowjava/openflowjava.yaml | 2 -- .../openflowplugin-csit-bulkomatic-clustering-daily.yaml | 3 --- ...penflowplugin-csit-bulkomatic-clustering-perf-daily.yaml | 3 --- .../openflowplugin-csit-bulkomatic-perf-daily.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-clustering.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-flow-services.yaml | 3 --- .../openflowplugin-csit-link-scalability-daily.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-longevity.yaml | 3 --- .../openflowplugin-csit-restconf-clustering-perf-daily.yaml | 3 --- .../openflowplugin-csit-restconf-perf-daily.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-sanity.yaml | 3 --- jjb/openflowplugin/openflowplugin-csit-scalability.yaml | 3 --- .../openflowplugin-csit-scale-stats-collection-daily.yaml | 3 --- .../openflowplugin-csit-sw-scalability-daily.yaml | 3 --- jjb/openflowplugin/openflowplugin.yaml | 3 --- jjb/ovil/ovil.yaml | 1 - jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 --- jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 --- jjb/ovsdb/ovsdb-full-integration.yaml | 5 ----- jjb/ovsdb/ovsdb.yaml | 3 --- jjb/packetcable/packetcable-csit-pcmm.yaml | 3 --- jjb/packetcable/packetcable.yaml | 3 --- jjb/releng-defaults.yaml | 2 ++ jjb/reservation/reservation.yaml | 3 --- jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml | 3 --- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 3 --- jjb/sfc/sfc-csit-full-deploy.yaml | 3 --- jjb/sfc/sfc-csit-rest-basic.yaml | 3 --- jjb/sfc/sfc-patch-test.yaml | 3 --- jjb/sfc/sfc-python.yaml | 2 -- jjb/sfc/sfc.yaml | 3 --- jjb/snbi/snbi.yaml | 3 --- jjb/snmp/snmp.yaml | 3 --- jjb/snmp4sdn/snmp4sdn.yaml | 3 --- jjb/sxp/sxp-csit-basic.yaml | 3 --- jjb/sxp/sxp-csit-cluster-routing.yaml | 3 --- jjb/sxp/sxp-csit-clustering.yaml | 3 --- jjb/sxp/sxp-csit-filtering.yaml | 3 --- jjb/sxp/sxp-csit-performance.yaml | 3 --- jjb/sxp/sxp-csit-topology.yaml | 3 --- jjb/sxp/sxp.yaml | 3 --- jjb/systemmetrics/systemmetrics.yaml | 3 --- .../topoprocessing-csit-topology-operation.yaml | 3 --- jjb/topoprocessing/topoprocessing.yaml | 3 --- jjb/transportpce/transportpce.yaml | 3 --- jjb/tsdr/tsdr-csit-cassandra.yaml | 3 --- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 3 --- jjb/tsdr/tsdr-csit-hbase.yaml | 3 --- jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 --- jjb/tsdr/tsdr.yaml | 3 --- jjb/ttp/ttp.yaml | 3 --- jjb/unimgr/unimgr-csit-basic.yaml | 3 --- jjb/unimgr/unimgr-csit-legato.yaml | 3 --- jjb/unimgr/unimgr.yaml | 3 --- jjb/usc/usc-csit-channel.yaml | 3 --- jjb/usc/usc-csit-tcp.yaml | 3 --- jjb/usc/usc.yaml | 3 --- jjb/usecplugin/usecplugin-csit-basic.yaml | 3 --- jjb/usecplugin/usecplugin.yaml | 3 --- jjb/vtn/vtn-csit-3node-manager.yaml | 3 --- jjb/vtn/vtn-csit-coordinator.yaml | 3 --- jjb/vtn/vtn-csit-manager.yaml | 3 --- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 3 --- jjb/vtn/vtn-patch-test.yaml | 3 --- jjb/vtn/vtn.yaml | 3 --- jjb/yang-push/yang-push.yaml | 3 --- jjb/yangide/yangide-releng.yaml | 1 - jjb/yangide/yangide.yaml | 3 --- jjb/yangtools/yangtools-csit-system.yaml | 3 --- jjb/yangtools/yangtools.yaml | 3 --- 186 files changed, 5 insertions(+), 551 deletions(-) diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 29feb59f1..8b5bec7c4 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 9534251ba..c579f22a9 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 5473951dd..5bd1c3fd6 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 2a1569b29..9e560e3cc 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 9f9560f80..b826a5e39 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -11,13 +11,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 feature: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 4885ca31f..49980f6e0 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -12,7 +12,6 @@ project: 'aaa' project-name: 'aaa' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'aaa' project-name: 'aaa' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'aaa' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 816563a8b..03d08d440 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 57f7b1453..ad6eb69cd 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -12,7 +12,6 @@ project: 'alto' project-name: 'alto' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'alto' project-name: 'alto' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'alto' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 03004a9e3..572547004 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -12,7 +12,6 @@ project: 'atrium' project-name: 'atrium' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'atrium' project-name: 'atrium' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'atrium' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 8d8cff7fd..f7b325801 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -16,13 +16,11 @@ - oxygen: next-release-tag: '{stream}' branch: 'master' - jdk: 'openjdk8' integration-test: oxygen extra-mvn-opts: -Dsft.heap.max=4g - nitrogen: next-release-tag: '{stream}' branch: 'stable/nitrogen' - jdk: 'openjdk8' integration-test: nitrogen extra-mvn-opts: -Dsft.heap.max=4g - carbon: @@ -30,7 +28,6 @@ cron: 'H 12 * * 0' next-release-tag: '{stream}' branch: 'stable/carbon' - jdk: 'openjdk8' integration-test: carbon karaf-version: karaf3 extra-mvn-opts: -Dskip.karaf4.featureTest=true diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index bdec61e8c..5af2e0728 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 83e448891..6d6190a27 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 3e33e7bf7..baad20af4 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 3a8a0d17b..b87c97297 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index da267c02d..d09bd4ce5 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 3b5691e79..cf2a2bbeb 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 93dacfe8a..3126ddf61 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index a4aa6f86a..a2c559d2c 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 693849af2..8f94c0174 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -17,13 +17,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index f308d8b0c..1670dcd91 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -11,13 +11,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 feature: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 16d8dcb65..86903309b 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -13,7 +13,6 @@ project-name: 'bgpcep' build-node: centos7-java-builder-4c-8g branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -45,7 +44,6 @@ project-name: 'bgpcep' build-node: centos7-java-builder-4c-8g branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -78,7 +76,6 @@ build-node: centos7-java-builder-4c-8g branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 322452d9d..b59c343d9 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -19,13 +19,10 @@ # Nitrogen if needed. - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: 'karaf3' verify-stream: 'nitrogen' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index c29d5a2d2..950a32e66 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -12,7 +12,6 @@ project: 'bier' project-name: 'bier' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'bier' project-name: 'bier' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'bier' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 938798744..8d1038ce8 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 2e7a81e06..768db6fbd 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -12,7 +12,6 @@ project: 'capwap' project-name: 'capwap' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'capwap' project-name: 'capwap' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'capwap' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 29610f47f..16e151fd3 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -12,7 +12,6 @@ project: 'cardinal' project-name: 'cardinal' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'cardinal' project-name: 'cardinal' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'cardinal' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index c1c29d3a5..6d783e508 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 395edf0b8..ea5576d16 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -12,7 +12,6 @@ project: 'centinel' project-name: 'centinel' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'centinel' project-name: 'centinel' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'centinel' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml index 76d8173b0..eec7462b0 100644 --- a/jjb/coe/coe-csit-openstack.yaml +++ b/jjb/coe/coe-csit-openstack.yaml @@ -25,10 +25,8 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' openstack: - ocata: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index be499099b..81c4fc7ff 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -12,7 +12,6 @@ project-name: 'coe' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project-name: 'coe' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -64,7 +62,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 203bc1c8c..f6f3e2af7 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -13,13 +13,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 6a0fd9205..612250df5 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 22536d91c..353fadb48 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 203c29355..5e1baa3bd 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 2ae01632a..226d14b99 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 1a3a82aaf..c251b410c 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index e59212078..f6e79b740 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 8dc65e547..798248543 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index f0b6656cb..aab5238c1 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 75d2a927b..4b47661a5 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index dd4a2256c..a30f5562c 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index a5769964d..8eaebd644 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index a9674af64..595df4a19 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -12,7 +12,6 @@ project: 'controller' project-name: 'controller' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'controller' project-name: 'controller' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'controller' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 87d57d208..cc66623c4 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -11,7 +11,6 @@ project: 'coretutorials' project-name: 'coretutorials' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project: 'coretutorials' project-name: 'coretutorials' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ project-name: 'coretutorials' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 01d90ecb2..6da14a22a 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -14,10 +14,8 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index d9db87ebd..a3ceedfcc 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -12,7 +12,6 @@ project-name: 'daexim' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project-name: 'daexim' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index d10ab897d..4f9e5c3cb 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index a9d2bb573..833b5fa1e 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -12,7 +12,6 @@ project: 'didm' project-name: 'didm' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'didm' project-name: 'didm' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'didm' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 3a1a73e00..91dbc7e60 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -12,7 +12,6 @@ project: 'dlux' project-name: 'dlux' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'dlux' project-name: 'dlux' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'dlux' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 32bea4c50..cbd02da9b 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index c80512cf3..18aeec376 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -12,7 +12,6 @@ project-name: 'dluxapps' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project-name: 'dluxapps' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 63a73ccbf..416c21d1e 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -12,7 +12,6 @@ project: 'eman' project-name: 'eman' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'eman' project-name: 'eman' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'eman' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index f9e4ddfd2..054845c86 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -12,7 +12,6 @@ project: 'faas' project-name: 'faas' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'faas' project-name: 'faas' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'faas' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 305192f66..170b0a412 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -12,7 +12,6 @@ project-name: 'federation' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project-name: 'federation' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 863f802e3..d6b35c278 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -20,13 +20,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index b9b4197bd..9537c3e9d 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -12,7 +12,6 @@ project: 'genius' project-name: 'genius' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -43,7 +42,6 @@ project: 'genius' project-name: 'genius' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -75,7 +73,6 @@ project-name: 'genius' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 6cafff929..4d42d19cd 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -21,15 +21,12 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index b79672ed9..640a508df 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 47d42d7e6..0fc6787a1 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 0fb50b7af..af92ac1f9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 690eb6ac1..e722b1a59 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -13,13 +13,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 1bd9015e3..8d25bb78e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -12,7 +12,6 @@ project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -43,7 +42,6 @@ project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -75,7 +73,6 @@ project-name: 'groupbasedpolicy' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 961591d84..3af61b89c 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -12,7 +12,6 @@ project: 'honeycomb/vbd' project-name: 'vbd' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'honeycomb/vbd' project-name: 'vbd' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'vbd' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 75b913502..c174df59d 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -12,7 +12,6 @@ project: 'infrautils' project-name: 'infrautils' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'infrautils' project-name: 'infrautils' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'infrautils' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 0a0d61305..fa5d9de21 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -14,17 +14,12 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 - # TODO: Add Beryllium when everything is backported there. - install: - all: scope: 'all' diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index b3fa5d273..3231c78bb 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -20,8 +20,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[int/dist]' - jdk: openjdk8 - jre: openjdk8 stream: - oxygen: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index cb0b81e1e..e440fe3b3 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,7 +18,6 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr csit-list: !include: csit-jobs-oxygen.lst csit-sanity-list: '{csit-sanity-list-oxygen}' @@ -27,7 +26,6 @@ - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr csit-list: !include: csit-jobs-nitrogen.lst csit-sanity-list: '{csit-sanity-list-nitrogen}' @@ -37,8 +35,6 @@ - carbon: branch: 'stable/carbon' karaf-version: karaf3 - jdk: 'openjdk8' - jre: 'openjdk8' csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc csit-list: !include: csit-jobs-carbon.lst csit-sanity-list: '{csit-sanity-list-carbon}' diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml index 942cbfaaa..22e61a94c 100644 --- a/jjb/integration/integration4-templates.yaml +++ b/jjb/integration/integration4-templates.yaml @@ -1,4 +1,7 @@ --- + +# TODO: This is only potentionally useful for Carbon. Remove this when Carbon is not supported anymore. + - job-template: name: '{project}-csit4-1node-{functionality}-{install}-nitrogen' # Keep synchronized with *-csit-* please. diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 6c4547b03..2903451c3 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 7af120d48..aa58386d0 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -12,7 +12,6 @@ project: 'iotdm' project-name: 'iotdm' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'iotdm' project-name: 'iotdm' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'iotdm' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 4dcb2780f..a71381207 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -17,16 +17,13 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' karaf-version: karaf3 # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 5e1f1065e..206efa4af 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -11,7 +11,6 @@ project-name: 'jsonrpc' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project-name: 'jsonrpc' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index f2e50847b..f59014075 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 8a14298da..f05ac233d 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index af91a3d9d..a5366538c 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 59f6007cc..bee9bf7a3 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -11,13 +11,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 feature: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 460e615cb..0710a32f6 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -12,7 +12,6 @@ project: 'l2switch' project-name: 'l2switch' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -43,7 +42,6 @@ project: 'l2switch' project-name: 'l2switch' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -75,7 +73,6 @@ project-name: 'l2switch' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index a379ff83d..e508b22d8 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 10cb7dd24..8f66995e8 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -12,7 +12,6 @@ project: 'lacp' project-name: 'lacp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 mvn-settings: 'lacp-settings' @@ -38,7 +37,6 @@ project: 'lacp' project-name: 'lacp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 mvn-settings: 'lacp-settings' @@ -65,7 +63,6 @@ project-name: 'lacp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 mvn-settings: 'lacp-settings' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index dd3f02f29..d0ffdf7b9 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 722794c0b..72ed9c2d7 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 5cbb2efbc..f4723eb47 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -12,7 +12,6 @@ project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -39,7 +38,6 @@ project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -67,7 +65,6 @@ project-name: 'lispflowmapping' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index b018bb00a..133d7098f 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -13,13 +13,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 robot-options: '-v JAVA_OPTIONS:-Xmx6656m' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 37704cd81..c937d67cb 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -12,7 +12,6 @@ project: 'mdsal' project-name: 'mdsal' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'mdsal' project-name: 'mdsal' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'mdsal' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index b736e74fb..45eadc26d 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 5a3c3bdc9..95a1ac9b6 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -12,7 +12,6 @@ project: 'messaging4transport' project-name: 'messaging4transport' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'messaging4transport' project-name: 'messaging4transport' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'messaging4transport' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index 6e16dcea6..c497cb8e7 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 68b25c20a..f08601eb8 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -12,7 +12,6 @@ project: 'natapp' project-name: 'natapp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'natapp' project-name: 'natapp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'natapp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 9f4509d30..5fd1f9950 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 89f541030..7555f5787 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -12,7 +12,6 @@ project: 'nemo' project-name: 'nemo' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'nemo' project-name: 'nemo' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'nemo' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 6580c76ba..65ab143da 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 6b9fb1af8..de4492d77 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 90583ad30..51c272d14 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 976e55aab..1148ba026 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index e406a318e..74fcde32a 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -11,13 +11,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 feature: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 298c32fbe..b9a00653c 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index a8ce3cd34..8316a476c 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -17,13 +17,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index d8d422588..1c850ce87 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -12,7 +12,6 @@ project: 'netconf' project-name: 'netconf' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'netconf' project-name: 'netconf' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'netconf' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 7857f5281..6b228d3d6 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index a7436e679..eaed56d4a 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -12,7 +12,6 @@ project: 'netide' project-name: 'netide' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'netide' project-name: 'netide' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'netide' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 9d4b101b4..eba1b27dd 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -7,7 +7,6 @@ project: 'netvirt' stream: 'oxygen' branch: 'master' - jre: 'openjdk8' topology: - 1node: @@ -71,7 +70,6 @@ project: 'netvirt' stream: 'nitrogen' branch: 'stable/nitrogen' - jre: 'openjdk8' topology: - 1node: @@ -138,7 +136,6 @@ stream: 'carbon' branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 topology: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 7a31b0b35..251481ee4 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -7,7 +7,6 @@ project: 'netvirt' stream: 'oxygen' branch: 'master' - jre: 'openjdk8' topology: - 1node: @@ -73,7 +72,6 @@ project: 'netvirt' stream: 'nitrogen' branch: 'stable/nitrogen' - jre: 'openjdk8' topology: - 1node: @@ -139,7 +137,6 @@ project: 'netvirt' stream: 'carbon' branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 topology: @@ -212,13 +209,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 openstack: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 53d543e81..f3e2446a3 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -7,15 +7,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: openjdk8 - jdks: - - openjdk8 karaf-version: karaf3 project: 'netvirt' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 9929fc930..d573b3b67 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -19,7 +19,6 @@ karaf-version: karaf3 project: 'netvirt' project-name: 'netvirt' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -49,7 +48,6 @@ branch: 'topic/vpp' karaf-version: karaf3 distribution_branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index db79a7ff3..2bd13426c 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -13,7 +13,6 @@ project-name: 'neutron' build-timeout: 60 branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -40,7 +39,6 @@ project-name: 'neutron' build-timeout: 60 branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -68,7 +66,6 @@ build-timeout: 60 branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 6e9cb5b3f..bab60f9f3 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -12,7 +12,6 @@ project: 'next' project-name: 'next' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'next' project-name: 'next' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'next' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index bb5f81a00..e82909d6b 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index be4ba859a..f97d0dcfe 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -12,7 +12,6 @@ project: 'nic' project-name: 'nic' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'nic' project-name: 'nic' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'nic' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index 2b05a0768..50d924e57 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index 1990796c4..125e70e72 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index f1f38a0ff..839d9614b 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -12,7 +12,6 @@ project: 'ocpplugin' project-name: 'ocpplugin' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'ocpplugin' project-name: 'ocpplugin' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'ocpplugin' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index d0209dff3..241a67931 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -13,7 +13,6 @@ branch: master distribution_branch: master - jdk: openjdk8 jdks: - openjdk8 maven: @@ -46,7 +45,6 @@ branch: 2.0.x distribution_branch: master - jdk: openjdk8 jdks: - openjdk8 maven: @@ -80,7 +78,6 @@ project-name: 'odlparent' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 62c6444de..c8ba5c7a2 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index c4b9f3c47..1a4f66400 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -12,7 +12,6 @@ project: 'of-config' project-name: 'of-config' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'of-config' project-name: 'of-config' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'of-config' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 3112d0811..4a56593fe 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -11,7 +11,6 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -61,7 +59,6 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/carbon' - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 4cb31bcb3..e20d5a0f7 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -12,7 +12,6 @@ project: 'openflowjava' project-name: 'openflowjava' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -39,7 +38,6 @@ project-name: 'openflowjava' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index 8f4aba0ce..7cf30d232 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml index 1cb47cd9c..b7a7e5616 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml index e6258a936..dd48aae3a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index 81f97ad39..1f79451b3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 9a5fea625..ff8aefb8f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 43def80ed..b42559e77 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 1ef98811c..9aff3f0c9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 39396949c..1262c9b2d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml index 023f0cc29..42e6a7df2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml index ee39a4369..67e9ba28a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 2b8718fcd..6233f84d7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 5498a6353..a8b8e5258 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index c59950c1b..75ac35404 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 865b1ca3d..6d66949cc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index c0e0471e1..f9f79d006 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -12,7 +12,6 @@ project: 'openflowplugin' project-name: 'openflowplugin' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -42,7 +41,6 @@ project: 'openflowplugin' project-name: 'openflowplugin' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -73,7 +71,6 @@ project-name: 'openflowplugin' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 7c584d835..0f83c0b79 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -11,7 +11,6 @@ stream: - oxygen: branch: master - jdk: openjdk8 mvn-settings: ovil-settings mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 7c2c3991c..2fc767152 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index df55323ea..ed3744c93 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -16,13 +16,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 4b83b0d0b..ad0238ba4 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -7,15 +7,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: openjdk8 - jdks: - - openjdk8 karaf-version: karaf3 project: 'ovsdb' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 751b21c1e..c95ebd933 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -12,7 +12,6 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'ovsdb' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 660f2104e..671609f2d 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 4a3bf9d37..379c1b86d 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -12,7 +12,6 @@ project: 'packetcable' project-name: 'packetcable' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'packetcable' project-name: 'packetcable' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'packetcable' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 5dad91b0d..98ac3ec90 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -96,6 +96,8 @@ verify-jdkversion: openjdk8 # Maven / Java + java-version: 'openjdk8' + jre: 'openjdk8' jdk: 'openjdk8' opendaylight-infra-mvn-opts: | --show-version diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index af90b04c3..c9a2bb439 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -11,7 +11,6 @@ project: 'reservation' project-name: 'reservation' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project: 'reservation' project-name: 'reservation' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ project-name: 'reservation' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 48bbb0b0a..93cdee812 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 8d61d315f..0329c730f 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -12,7 +12,6 @@ project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'sdninterfaceapp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 0417bfbeb..d9841368e 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index c2b20536a..0798c705a 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 113dee043..df1ae61b5 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -11,13 +11,10 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 feature: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 1e091f525..c69711e8c 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -7,10 +7,8 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 4c1db60a1..35d55d11a 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -12,7 +12,6 @@ project: 'sfc' project-name: 'sfc' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'sfc' project-name: 'sfc' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'sfc' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 826bf95c3..3472a372a 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -12,7 +12,6 @@ project: 'snbi' project-name: 'snbi' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'snbi' project-name: 'snbi' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'snbi' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 170ac0392..e8a705c63 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -12,7 +12,6 @@ project: 'snmp' project-name: 'snmp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'snmp' project-name: 'snmp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'snmp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 37132955b..982c6c19b 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -12,7 +12,6 @@ project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'snmp4sdn' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 47fe89ded..48fefa835 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index 9f999fc8e..944900908 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 1558fd35e..9357903a1 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index aca577a0a..930c1073f 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 9b3eac025..50fc054c5 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 1693711d2..cd76ffac8 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -14,13 +14,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 1175fe05c..a8538cd7b 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -12,7 +12,6 @@ project: 'sxp' project-name: 'sxp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'sxp' project-name: 'sxp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'sxp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index e56ee94a2..03d5fa776 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -11,7 +11,6 @@ project-name: 'systemmetrics' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project-name: 'systemmetrics' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 3e6418f88..d80673510 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 4dc477ff9..d9381311d 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -12,7 +12,6 @@ project: 'topoprocessing' project-name: 'topoprocessing' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'topoprocessing' project-name: 'topoprocessing' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'topoprocessing' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 534cb4fee..d424f7961 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -11,7 +11,6 @@ project-name: 'transportpce' stream: oxygen branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project-name: 'transportpce' stream: nitrogen branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 29249729d..75e222127 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index efb1bfe5a..4041decbb 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index cbc43af58..d7fb207fb 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 60ab2b38f..c997550d6 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index f90ec708d..9ccf6eb5e 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -12,7 +12,6 @@ project: 'tsdr' project-name: 'tsdr' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'tsdr' project-name: 'tsdr' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'tsdr' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index c5c0a8981..26a6dde3e 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -12,7 +12,6 @@ project: 'ttp' project-name: 'ttp' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'ttp' project-name: 'ttp' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'ttp' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 24b9188cc..4f43a183c 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index a8f975906..603511918 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 60bda6dab..1b6f6565d 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -12,7 +12,6 @@ project: 'unimgr' project-name: 'unimgr' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'unimgr' project-name: 'unimgr' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'unimgr' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 3cd0fd7fd..b1a498027 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 2ec189879..44a3c092c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index e5e855657..f0a648e95 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -12,7 +12,6 @@ project: 'usc' project-name: 'usc' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'usc' project-name: 'usc' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'usc' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 1740dfab8..95dc05321 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 5afdbd3ee..fcf7d7563 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -12,7 +12,6 @@ project: 'usecplugin' project-name: 'usecplugin' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'usecplugin' project-name: 'usecplugin' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'usecplugin' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 122ae874c..8a023d3d8 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 181621249..de9d9b896 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 59f9284e2..7b5f7cff4 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -15,13 +15,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 1aca07d54..d17a2f068 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -22,13 +22,10 @@ stream: - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 openstack: diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index 1195053c0..6e378e4a5 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -13,19 +13,16 @@ stream: - oxygen: branch: 'master' - jdk: 'openjdk8' csit-list: > vtn-csit-1node-manager-all-{stream}, vtn-csit-3node-manager-all-{stream} - nitrogen: branch: 'stable/nitrogen' - jdk: 'openjdk8' csit-list: > vtn-csit-1node-manager-all-{stream}, vtn-csit-3node-manager-all-{stream} - carbon: branch: 'stable/carbon' - jdk: 'openjdk8' karaf-version: karaf3 csit-list: > vtn-csit-1node-manager-all-{stream}, diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 0d2319dd6..8e6f8f1de 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -12,7 +12,6 @@ project: 'vtn' project-name: 'vtn' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -42,7 +41,6 @@ project: 'vtn' project-name: 'vtn' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -73,7 +71,6 @@ project-name: 'vtn' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 06e6500b7..2bebf2950 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -12,7 +12,6 @@ project: 'yang-push' project-name: 'yang-push' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -38,7 +37,6 @@ project: 'yang-push' project-name: 'yang-push' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -65,7 +63,6 @@ project-name: 'yang-push' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/yangide/yangide-releng.yaml b/jjb/yangide/yangide-releng.yaml index c10f9eb56..cad1f2fbb 100644 --- a/jjb/yangide/yangide-releng.yaml +++ b/jjb/yangide/yangide-releng.yaml @@ -7,6 +7,5 @@ project: yangide project-name: 'yangide' - jdk: 'openjdk8' stage-id: 'fba306956f98' mvn-settings: 'yangide-settings' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 832627a47..e7c3ae7ea 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -11,7 +11,6 @@ project: 'yangide' project-name: 'yangide' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -36,7 +35,6 @@ project: 'yangide' project-name: 'yangide' branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -62,7 +60,6 @@ project-name: 'yangide' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 0b523d002..0cd058196 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -15,13 +15,10 @@ # The tested component was only introduced in Carbon. - oxygen: branch: 'master' - jre: 'openjdk8' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' - carbon: branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 install: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index ea6fd7712..3573a6aac 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -12,7 +12,6 @@ project: 'yangtools' project-name: 'yangtools' branch: 'master' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -39,7 +38,6 @@ project-name: 'yangtools' branch: 'v1.2.x' distribution_branch: 'stable/nitrogen' - jdk: openjdk8 jdks: - openjdk8 maven: @@ -66,7 +64,6 @@ project-name: 'yangtools' branch: 'stable/carbon' karaf-version: karaf3 - jdk: openjdk8 jdks: - openjdk8 maven: -- 2.36.6