From 0e0e34daa29f5cd386428cc72571b1e3dee6abfa Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 12 May 2018 10:56:04 +1000 Subject: [PATCH] Remove nitrogen branches in projects Remove nitrogen branches in projects in releng/builder Ref: https://meetings.opendaylight.org/opendaylight-meeting/2018/tsc/opendaylight-meeting-tsc.2018-04-26-16.59.html Change-Id: I1ebc5153dc61c564e3d06d16e7d2f6db5661eec8 Signed-off-by: Anil Belur Signed-off-by: Jamo Luhrsen --- jjb/aaa/aaa-csit-authn.yaml | 2 - jjb/aaa/aaa-csit-keystone.yaml | 2 - jjb/aaa/aaa-csit-tls.yaml | 2 - jjb/aaa/aaa-patch-test.yaml | 2 - jjb/aaa/aaa.yaml | 18 -------- jjb/alto/alto-csit-setup.yaml | 2 - jjb/alto/alto.yaml | 19 --------- jjb/atrium/atrium.yaml | 18 -------- .../bgpcep-csit-bgp-gate-ingest-mixed.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 6 --- .../bgpcep-csit-bgpclustering-longevity.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 - jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml | 2 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 2 - jjb/bgpcep/bgpcep-patch-test.yaml | 2 - jjb/bgpcep/bgpcep.yaml | 26 ------------ jjb/bier/bier-csit-basic.yaml | 10 +---- jjb/bier/bier.yaml | 19 --------- jjb/capwap/capwap-csit-ac.yaml | 2 - jjb/capwap/capwap.yaml | 18 -------- jjb/cardinal/cardinal.yaml | 18 -------- jjb/centinel/centinel-csit-basic.yaml | 2 - jjb/centinel/centinel.yaml | 18 -------- jjb/coe/coe.yaml | 18 -------- jjb/controller/controller-csit-akka1.yaml | 2 - .../controller-csit-clustering.yaml | 2 - .../controller-csit-cs-chasing-leader.yaml | 2 - .../controller-csit-cs-partnheal.yaml | 2 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 2 - .../controller-csit-dnb-noloss.yaml | 2 - .../controller-csit-drb-partnheal.yaml | 2 - .../controller-csit-drb-precedence.yaml | 2 - .../controller-csit-dsbenchmark-cluster.yaml | 2 - .../controller-csit-dsbenchmark.yaml | 2 - .../controller-csit-rest-cars-perf.yaml | 2 - .../controller-csit-rest-clust-cars-perf.yaml | 2 - jjb/controller/controller.yaml | 21 ---------- jjb/coretutorials/coretutorials.yaml | 18 -------- jjb/daexim/daexim-csit-basic.yaml | 2 - jjb/daexim/daexim-csit-clustering-basic.yaml | 2 - jjb/daexim/daexim.yaml | 18 -------- jjb/didm/didm-csit-discovery.yaml | 2 - jjb/didm/didm.yaml | 18 -------- jjb/dlux/dlux.yaml | 18 -------- jjb/dluxapps/dluxapps-csit-yangman.yaml | 5 --- jjb/dluxapps/dluxapps.yaml | 39 ------------------ jjb/docs/docs-rtd.yaml | 2 - jjb/eman/eman.yaml | 20 --------- jjb/faas/faas.yaml | 18 -------- jjb/federation/federation.yaml | 19 --------- jjb/genius/genius-csit-genius.yaml | 28 ------------- jjb/genius/genius-patch-test.yaml | 3 -- jjb/genius/genius.yaml | 39 ------------------ ...groupbasedpolicy-csit-1node-openstack.yaml | 3 -- .../groupbasedpolicy-csit-3node.yaml | 2 - .../groupbasedpolicy-csit-6node.yaml | 2 - .../groupbasedpolicy-csit-clustering.yaml | 2 - .../groupbasedpolicy-csit-sxp.yaml | 2 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 25 ----------- jjb/honeycomb/vbd/vbd.yaml | 18 -------- jjb/infrautils/infrautils-patch-test.yaml | 3 -- jjb/infrautils/infrautils.yaml | 18 -------- jjb/iotdm/iotdm-csit-basic.yaml | 2 - jjb/iotdm/iotdm.yaml | 19 --------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 5 --- jjb/jsonrpc/jsonrpc.yaml | 17 -------- .../l2switch-csit-host-scalability-daily.yaml | 2 - jjb/l2switch/l2switch-csit-scalability.yaml | 2 - jjb/l2switch/l2switch-csit-switch.yaml | 2 - jjb/l2switch/l2switch-patch-test.yaml | 2 - jjb/l2switch/l2switch.yaml | 23 ----------- jjb/lacp/lacp-csit-lacp.yaml | 2 - jjb/lacp/lacp.yaml | 18 -------- .../lispflowmapping-csit-msmr.yaml | 2 - .../lispflowmapping-csit-performance.yaml | 2 - jjb/lispflowmapping/lispflowmapping.yaml | 25 ----------- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 - jjb/mdsal/mdsal.yaml | 21 ---------- .../messaging4transport-csit-basic.yaml | 2 - .../messaging4transport.yaml | 19 --------- jjb/natapp/natapp.yaml | 19 --------- jjb/nemo/nemo-csit-engine.yaml | 2 - jjb/nemo/nemo.yaml | 18 -------- jjb/netconf/netconf-cluster-stress.yaml | 5 --- jjb/netconf/netconf-clustering-scale.yaml | 5 --- jjb/netconf/netconf-clustering.yaml | 5 --- jjb/netconf/netconf-csit-callhome.yaml | 5 --- jjb/netconf/netconf-patch-test.yaml | 5 --- jjb/netconf/netconf-scale.yaml | 5 --- jjb/netconf/netconf-userfeatures.yaml | 5 --- jjb/netconf/netconf.yaml | 41 ------------------- jjb/netide/netide-csit-basic.yaml | 2 - jjb/netide/netide.yaml | 18 -------- jjb/neutron/neutron.yaml | 20 --------- jjb/next/next.yaml | 18 -------- jjb/nic/nic-csit-basic.yaml | 27 ------------ jjb/nic/nic.yaml | 19 --------- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 27 ------------ jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 27 ------------ jjb/ocpplugin/ocpplugin.yaml | 18 -------- jjb/odlparent/odlparent.yaml | 30 -------------- jjb/of-config/of-config-csit-basic.yaml | 2 - jjb/of-config/of-config.yaml | 18 -------- jjb/ofextensions/circuitsw/circuitsw.yaml | 17 -------- jjb/openflowjava/openflowjava.yaml | 29 ------------- .../openflowplugin-csit-cbench.yaml | 2 - ...flowplugin-csit-clustering-bulkomatic.yaml | 2 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 - .../openflowplugin-csit-clustering.yaml | 2 - .../openflowplugin-csit-flow-services.yaml | 2 - .../openflowplugin-csit-longevity.yaml | 2 - .../openflowplugin-csit-perf-bulkomatic.yaml | 2 - ...flowplugin-csit-perf-stats-collection.yaml | 2 - .../openflowplugin-csit-sanity.yaml | 2 - .../openflowplugin-csit-scale-link.yaml | 2 - .../openflowplugin-csit-scale-switch.yaml | 2 - .../openflowplugin-csit-scale.yaml | 2 - .../openflowplugin-patch-test.yaml | 3 -- jjb/openflowplugin/openflowplugin.yaml | 26 ------------ jjb/opflex/opflex-custom.yaml | 5 --- .../opflex-thirdparty-dependencies.yaml | 5 --- jjb/opflex/opflex.yaml | 5 --- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 2 - jjb/ovsdb/ovsdb-full-integration.yaml | 5 --- jjb/ovsdb/ovsdb-patch-test.yaml | 3 -- jjb/ovsdb/ovsdb.yaml | 20 --------- jjb/packetcable/packetcable-csit-pcmm.yaml | 2 - jjb/packetcable/packetcable.yaml | 18 -------- jjb/persistence/persistence.yaml | 18 -------- jjb/releng-defaults.yaml | 34 +++------------ jjb/releng-views.yaml | 12 ------ jjb/reservation/reservation.yaml | 17 -------- .../sdninterfaceapp-csit-basic.yaml | 2 - jjb/sdninterfaceapp/sdninterfaceapp.yaml | 19 --------- jjb/sfc/sfc-csit-full-deploy.yaml | 2 - jjb/sfc/sfc-csit-rest-basic.yaml | 2 - jjb/sfc/sfc-patch-test.yaml | 2 - jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 19 --------- jjb/snbi/snbi.yaml | 18 -------- jjb/snmp/snmp.yaml | 18 -------- jjb/snmp4sdn/snmp4sdn.yaml | 18 -------- jjb/sxp/sxp-csit-basic.yaml | 2 - jjb/sxp/sxp-csit-cluster-routing.yaml | 2 - jjb/sxp/sxp-csit-clustering.yaml | 2 - jjb/sxp/sxp-csit-filtering.yaml | 2 - jjb/sxp/sxp-csit-performance.yaml | 2 - jjb/sxp/sxp-csit-topology.yaml | 2 - jjb/sxp/sxp.yaml | 18 -------- jjb/systemmetrics/systemmetrics.yaml | 34 --------------- ...opoprocessing-csit-topology-operation.yaml | 27 ------------ jjb/topoprocessing/topoprocessing.yaml | 18 -------- jjb/transportpce/transportpce.yaml | 17 -------- jjb/tsdr/tsdr-csit-cassandra.yaml | 2 - jjb/tsdr/tsdr-csit-elasticsearch.yaml | 2 - jjb/tsdr/tsdr-csit-hbase.yaml | 2 - jjb/tsdr/tsdr-csit-hsqldb.yaml | 2 - jjb/tsdr/tsdr.yaml | 18 -------- jjb/ttp/ttp.yaml | 18 -------- jjb/unimgr/unimgr-csit-basic.yaml | 30 -------------- jjb/unimgr/unimgr-csit-legato.yaml | 33 --------------- jjb/unimgr/unimgr.yaml | 19 --------- jjb/usc/usc-csit-channel.yaml | 2 - jjb/usc/usc-csit-tcp.yaml | 2 - jjb/usc/usc.yaml | 19 --------- jjb/usecplugin/usecplugin-csit-basic.yaml | 2 - jjb/usecplugin/usecplugin.yaml | 18 -------- jjb/yang-push/yang-push.yaml | 18 -------- jjb/yangide/yangide.yaml | 17 -------- jjb/yangtools/yangtools-csit-system.yaml | 3 -- jjb/yangtools/yangtools.yaml | 28 ------------- 175 files changed, 8 insertions(+), 1801 deletions(-) delete mode 100644 jjb/nic/nic-csit-basic.yaml delete mode 100644 jjb/ocpplugin/ocpplugin-csit-basic.yaml delete mode 100644 jjb/ocpplugin/ocpplugin-csit-scalability.yaml delete mode 100644 jjb/openflowjava/openflowjava.yaml delete mode 100644 jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml delete mode 100644 jjb/unimgr/unimgr-csit-basic.yaml delete mode 100644 jjb/unimgr/unimgr-csit-legato.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index c085faa4f..36bdb6040 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 8d0f33daf..a3ca1d321 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 5d6d1acb7..189501c35 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 2930bd0fb..c0e58d68a 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 129604754..1a60b2883 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -35,24 +35,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'aaa' - project-name: 'aaa' - branch: 'stable/nitrogen' - mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 9318cf3c82c33 - - project: name: aaa-sonar jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index bb7640b27..c0c1c0434 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 3ce968020..e1ad649ae 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: 931eabae9693c -- project: - name: alto-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'alto' - project-name: 'alto' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - - # Used by the release job - staging-profile-id: 931eabae9693c - - project: name: alto-sonar jobs: diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 774cb2576..ca443e740 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 9324f12310e6a -- project: - name: atrium-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'atrium' - project-name: 'atrium' - branch: 'stable/nitrogen' - mvn-settings: 'atrium-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[atrium]' - - # Used by the release job - staging-profile-id: 9324f12310e6a - - project: name: atrium-sonar jobs: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 210728107..e71dd3e0f 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 4519cfad5..da0f2ffb0 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 145040d37..ca9fa8ce9 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index c2cf62664..feca52dad 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -30,12 +30,6 @@ odl-bgpcep-bmp, odl-bgpcep-bmp-config-example, odl-bgpcep-pcep - - nitrogen: - branch: 'stable/nitrogen' - install-features: > - odl-restconf, - odl-bgpcep-bgp, - odl-bgpcep-bgp-config-example install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index bc8c1941f..4c19390a4 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 7fdae26eb..dd72b0f53 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index da17fd358..b902204cc 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 23b665162..0874aa7d6 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index dfb6adbfe..98542632c 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -19,8 +19,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 5e8d35d69..f1e2b7a4a 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 412da0013..bc4f4e1ea 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -51,32 +51,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/nitrogen' - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - - # Used by the release job - staging-profile-id: 9427a05049030 - - project: name: bgpcep-sonar jobs: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 66b7c4143..67dcb5c01 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,19 +13,13 @@ # Project branches stream: - # Removed jobs testing Carbon branches due to the CSIT update - # incompatible changes in test suites for Nitrogen - # TODO: Create test suites for specific release before - # Nitrogen if needed. - fluorine: branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - verify-stream: 'nitrogen' - verify-branch: 'stable/nitrogen' + verify-stream: 'oxygen' + verify-branch: 'stable/oxygen' verify-karaf-version: 'karaf4' install: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index ba53880bf..c3e51500a 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -38,25 +38,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'bier' - project-name: 'bier' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[bier]' - - # Used by the release job - staging-profile-id: 942a8075b1f2a - - project: name: bier-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 46f26c564..1ed2c5d6c 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 7c684484a..ed7c55974 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96bd6b5bf86e3 -- project: - name: capwap-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'capwap' - project-name: 'capwap' - branch: 'stable/nitrogen' - mvn-settings: 'capwap-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - - # Used by the release job - staging-profile-id: 96bd6b5bf86e3 - - project: name: capwap jobs: diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index c2fe7cdfb..00397abdd 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96be20348f0f2 -- project: - name: cardinal-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'cardinal' - project-name: 'cardinal' - branch: 'stable/nitrogen' - mvn-settings: 'cardinal-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' - email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - - # Used by the release job - staging-profile-id: 96be20348f0f2 - - project: name: cardinal-sonar jobs: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 709290183..47ba93e77 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 5d8da824d..53da8f640 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96bf9b3fefd8a -- project: - name: centinel-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'centinel' - project-name: 'centinel' - branch: 'stable/nitrogen' - mvn-settings: 'centinel-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[centinel]' - - # Used by the release job - staging-profile-id: 96bf9b3fefd8a - - project: name: centinel-sonar jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 6e27ebc45..ba3c14be5 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -37,24 +37,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'coe' - project-name: 'coe' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[coe] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96c0be46aac33 - - project: name: coe-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 74f10a059..e3488469e 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -15,8 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 5123bc388..56ab3272c 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 5cff7f2cb..b8cc17ed8 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 541a5dcd5..14b1725da 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 3d0d69887..33c84f632 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index a11f40642..f0b6362b9 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 156522b5f..8cad5fe09 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index cb0ade8ab..742d2b90f 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index f64faedde..472c2fa75 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 6edd88909..3c8973cb1 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 25ae25545..82196035c 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 616bee0ee..80b54ae4c 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index ed072791d..d6fc7143a 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -43,27 +43,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'controller' - project-name: 'controller' - branch: 'stable/nitrogen' - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 78b683e71..7c6b90717 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -35,24 +35,6 @@ # Used by the release job staging-profile-id: 96cd299563ec6 -- project: - name: coretutorials-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/nitrogen' - mvn-settings: 'coretutorials-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - build-timeout: 120 - - # Used by the release job - staging-profile-id: 96cd299563ec6 - - project: name: coretutorials-sonar jobs: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 083be0a88..1324d4df2 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 08da6af2c..b34bcd5c4 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 5fb3dd0d2..cb3eec201 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -35,24 +35,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'daexim' - project-name: 'daexim' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index ef01af1a4..b1e4b2014 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 30fd8f6d5..ff620ae1f 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96e6338c870f5 -- project: - name: didm-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'didm' - project-name: 'didm' - branch: 'stable/nitrogen' - mvn-settings: 'didm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - - # Used by the release job - staging-profile-id: 96e6338c870f5 - - project: name: didm-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index e878163c4..7c799b44a 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96e6a0327484f -- project: - name: dlux-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'dlux' - project-name: 'dlux' - branch: 'stable/nitrogen' - mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - - # Used by the release job - staging-profile-id: 96e6a0327484f - - project: name: dlux-sonar jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index b0c568b21..46f7ae503 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index a31fdfa21..ca850310b 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -36,45 +36,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: nitrogen - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - -- project: - name: dluxapps-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: carbon - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - - project: name: dluxapps-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 1a8287d82..ac1419706 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -10,8 +10,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' project: docs project-name: docs diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 31d0eba08..3a3271a10 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -38,26 +38,6 @@ # Used by the release job staging-profile-id: 96e9352979521 -- project: - name: eman-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'eman' - project-name: 'eman' - branch: 'stable/nitrogen' - mvn-settings: 'eman-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[eman]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: 96e9352979521 - - project: name: eman-sonar jobs: diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 39bef773b..ea767f6e9 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96f5ac591d858 -- project: - name: faas-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'faas' - project-name: 'faas' - branch: 'stable/nitrogen' - mvn-settings: 'faas-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - - # Used by the release job - staging-profile-id: 96f5ac591d858 - - project: name: faas-sonar jobs: diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 30fa052fa..d08bc6a46 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: 96f78c7a40a24 -- project: - name: federation-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - project: 'federation' - project-name: 'federation' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'federation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[federation] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96f78c7a40a24 - - project: name: federation-sonar jobs: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 7fcab6c0b..056e8a3c1 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -27,34 +27,6 @@ install-features: 'odl-genius-rest' - -- project: - name: genius-csit-genius-carbon-nitrogen - jobs: - - inttest-csit-1node - - inttest-csit-3node - - project: 'genius' - - functionality: - - 'upstream' - - 'gate' - - stream: - - nitrogen: - branch: 'stable/nitrogen' - - testplan: 'genius-carbon-nitrogen.txt' - - install: - - all: - scope: 'all' - - tools_system_count: 3 - - install-features: 'odl-genius-rest' - - - project: name: genius-csit-genius-verify jobs: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 64c7817bf..b9f22ec4c 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -13,9 +13,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index bd092cc1c..8f80fda17 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,11 +4,6 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: genius - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ - rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: fluorine @@ -35,11 +30,6 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: genius - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ - rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: oxygen @@ -61,35 +51,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: genius - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ - rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - - odl-maven-jobs - - stream: nitrogen - project: 'genius' - project-name: 'genius' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - - project: name: genius-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index c71f00846..8b4b54639 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -25,9 +25,6 @@ - oxygen: branch: 'stable/oxygen' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - nitrogen: - branch: 'stable/nitrogen' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' openstack: - ocata: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 4467a8f6d..a0f6b62e8 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 6c160b554..191c88f1e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 75c71ffbe..6395c4052 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index f193d5e31..3fa1a99c5 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -15,8 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index f7cdd2057..93534339a 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -50,31 +50,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - - # Used by the release job - staging-profile-id: 96fbb93f95a76 - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index ec193bb09..936c72b1e 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96fc362c36862 -- project: - name: vbd-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/nitrogen' - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - - # Used by the release job - staging-profile-id: 96fc362c36862 - - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 34a5f9690..388131449 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -13,9 +13,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' jdk: 'openjdk8' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 0390cc3a0..149572b0a 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -37,24 +37,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/nitrogen' - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - - # Used by the release job - staging-profile-id: 96fca0367756c - - project: name: infrautils-sonar jobs: diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index d703d35a7..faac19f1e 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 00d7b9769..fd5890281 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: 96fd6e9453970 -- project: - name: iotdm-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'iotdm' - project-name: 'iotdm' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'iotdm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'aaa-merge-{stream}' - email-upstream: '[iotdm] [aaa]' - - # Used by the release job - staging-profile-id: 96fd6e9453970 - - project: name: iotdm-sonar jobs: diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index c83d90cb8..49f1336b6 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -19,11 +19,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - 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' install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 168fa943b..4b0311c70 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -34,23 +34,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-nitrogen - jobs: - - odl-maven-jobs - - project: 'jsonrpc' - project-name: 'jsonrpc' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' - email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - - # Used by the release job - staging-profile-id: 96fdf4408765d - - project: name: jsonrpc-sonar jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 8509c0139..5b7bd6afc 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index c85c9f64d..615aee50e 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 62e8620c0..52756aa82 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index b3a3a205d..d579e9f51 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' feature: - all: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index c55bb6ced..ab0fc666c 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -44,29 +44,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/nitrogen' - mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96fee85953ca0 - - project: name: l2switch-sonar jobs: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 53fee1754..4996065d7 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 792f5ddb9..cdeed106f 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: 96ff6c0ff6ab1 -- project: - name: lacp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'lacp' - project-name: 'lacp' - branch: 'stable/nitrogen' - mvn-settings: 'lacp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96ff6c0ff6ab1 - - project: name: lacp-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 0067ee76a..3ed9a6506 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 9a8a7b434..85662fa09 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 5fa2f1e67..a14c7ffc8 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -49,31 +49,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/nitrogen' - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - archive-artifacts: > - **/*.log - **/target/surefire-reports/*-output.txt - - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 8fd766fd6..70cebc427 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -15,8 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 86cb2c3ef..2f9a39a92 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -45,27 +45,6 @@ # Used by the release job staging-profile-id: a674173c7b29d -- project: - name: mdsal-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/nitrogen' - build-node: centos7-builder-8c-8g - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a674173c7b29d - - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index df3049ed0..3c620626f 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index aba72d8c2..f1cc04467 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a677283157db4 -- project: - name: messaging4transport-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/nitrogen' - mvn-settings: 'messaging4transport-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - - # Used by the release job - staging-profile-id: a677283157db4 - - project: name: messaging4transport-sonar jobs: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 4b0235ec4..f42bc0c8a 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a679c0f4f08a8 -- project: - name: natapp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'natapp' - project-name: 'natapp' - branch: 'stable/nitrogen' - mvn-settings: 'natapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[natapp] [openflowplugin]' - - # Used by the release job - staging-profile-id: a679c0f4f08a8 - - project: name: natapp-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index ea5003956..e856c23bc 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index eefa87c6e..97c35cdbe 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'nemo' - project-name: 'nemo' - branch: 'stable/nitrogen' - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - - # Used by the release job - staging-profile-id: a67a9890f6202 - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 122759990..e107549d2 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 9b992e576..35393c283 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 1cc6053f4..0deef710b 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 9579718bc..0a400d422 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index c64b959d0..cfc4e9427 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -13,11 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - core: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index b736bc20a..7c63b90f2 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 90f876065..9b6af63a8 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -19,11 +19,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 5e5054050..67246a2fd 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -41,47 +41,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'netconf' - project-name: 'netconf' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a67b22fc3663f - -- project: - name: netconf-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'netconf' - project-name: 'netconf' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a67b22fc3663f - - project: name: netconf-sonar jobs: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 0ce1d8122..7677a6596 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 3599f849a..8fbfacff1 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a67bab3755815 -- project: - name: netide-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'netide' - project-name: 'netide' - branch: 'stable/nitrogen' - mvn-settings: 'netide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - - # Used by the release job - staging-profile-id: a67bab3755815 - - project: name: netide-sonar jobs: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index b51ce7ad2..48bd2756b 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -39,26 +39,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'neutron' - project-name: 'neutron' - build-timeout: 60 - branch: 'stable/nitrogen' - mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - - # Used by the release job - staging-profile-id: a67e1b40d7419 - - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index c3025ee07..86b6a16d8 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a67e7c516f385 -- project: - name: next-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'next' - project-name: 'next' - branch: 'stable/nitrogen' - mvn-settings: 'next-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - - # Used by the release job - staging-profile-id: a67e7c516f385 - - project: name: next-sonar jobs: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml deleted file mode 100644 index 59b60a8fd..000000000 --- a/jjb/nic/nic-csit-basic.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: nic-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'nic' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-nic-intent-common' - - # Robot custom options - robot-options: '' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index f79f0cf59..8bf2afef3 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a67ef386204aa -- project: - name: nic-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'nic' - project-name: 'nic' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'nic-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - - # Used by the release job - staging-profile-id: a67ef386204aa - - project: name: nic-sonar jobs: diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml deleted file mode 100644 index 6b3da1bfe..000000000 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ocpplugin-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'ocpplugin' - - # The functionality under test - functionality: 'get' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all' - - # Robot custom options - robot-options: '' diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml deleted file mode 100644 index a1ee88d22..000000000 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ocpplugin-csit-scalability - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'ocpplugin' - - # The functionality under test - functionality: 'scalability' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all' - - # Robot custom options - robot-options: '' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 87c429e09..496e31ec7 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a687673279f9c -- project: - name: ocpplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'ocpplugin' - project-name: 'ocpplugin' - branch: 'stable/nitrogen' - mvn-settings: 'ocpplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a687673279f9c - - project: name: ocpplugin-sonar jobs: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 5c89996ce..8443966a5 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -89,36 +89,6 @@ javadoc-path: org.opendaylight.$PROJECT/$STREAM staging-profile-id: 880d5ac25eaa -- project: - name: odlparent-2.0.x - jobs: - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - gerrit-tox-verify - - project: odlparent - project-name: odlparent - stream: 2.0.x - branch: 2.0.x - distribution_branch: master - - mvn-settings: odlparent-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - dependencies: '' - email-upstream: '[odlparent]' - archive-artifacts: > - **/*.prop - **/*.log - **/target/surefire-reports/*-output.txt - **/target/failsafe-reports/failsafe-summary.xml - **/hs_err_*.log - **/target/feature/feature.xml - - # Used by the release job - javadoc-path: org.opendaylight.$PROJECT/$STREAM - staging-profile-id: 880d5ac25eaa - - project: name: odlparent-sonar jobs: diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index f806380c1..5af388393 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 998c03f21..b9366d2c9 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'of-config' - project-name: 'of-config' - branch: 'stable/nitrogen' - mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - - # Used by the release job - staging-profile-id: a6880455efe67 - - project: name: of-config-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 77ea9f218..4198831a9 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -33,23 +33,6 @@ # Used by the release job staging-profile-id: a68970cf5b25c -- project: - name: circuitsw-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/nitrogen' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - - # Used by the release job - staging-profile-id: a68970cf5b25c - - project: name: circuitsw-sonar jobs: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml deleted file mode 100644 index e207ab800..000000000 --- a/jjb/openflowjava/openflowjava.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: openflowjava-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'master' - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a68a1507dae22 - -- project: - name: openflowjava-sonar - jobs: - - gerrit-maven-sonar - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'master' - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 7bf4f2a3b..0dbd48791 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 9a22ec92b..3bdae033a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index c4740342c..e5014dcc9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index da1520e4b..9dbcd65dc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 0d41cc9de..abf863557 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 38b8e609a..936c67d83 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index bd2808eff..7bf25d470 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 981ad1064..e45e444ca 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 6cccdbf83..7154b80d0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 567959a20..32d727a13 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 21202836b..fb43dd599 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index a93ea5e08..ed891598f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 6f50fbc52..083337d1f 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -15,9 +15,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 07582f1f8..bfe99c76e 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -51,32 +51,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - build-timeout: 90 - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 593d22a97..4490a3898 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -16,11 +16,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml index b018d80d7..a0f30f724 100644 --- a/jjb/opflex/opflex-thirdparty-dependencies.yaml +++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml @@ -12,11 +12,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 323de7492..c3c7a6699 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -15,11 +15,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 1ab742cb4..d81919881 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index ed3a0a021..bb00aba5f 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -18,8 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 0e24962d8..034696f57 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -9,11 +9,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 5a45af0b3..b1f000bed 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -14,9 +14,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index ee9d84b7f..2e745ee31 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -38,23 +38,3 @@ # Used by the release job staging-profile-id: a68b188166958 - -- project: - name: ovsdb-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a68b188166958 diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 11ebc0952..44a7263f0 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index ed16d18cb..ebf860f78 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/nitrogen' - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - - # Used by the release job - staging-profile-id: a68ca4a24655c - - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index f9b73e441..4d6d1ff38 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -35,24 +35,6 @@ # Used by the release job staging-profile-id: a68d3c2bb44d1 -- project: - name: persistence-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'persistence' - project-name: 'persistence' - branch: 'stable/nitrogen' - jdk: openjdk7 - mvn-settings: 'persistence-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - - # Used by the release job - staging-profile-id: a68d3c2bb44d1 - - project: name: persistence-sonar jobs: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index b0fc45b59..d5eb42201 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -101,9 +101,9 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/carbon + verify-branch: stable/oxygen # Value for ODL_STREAM - verify-stream: carbon + verify-stream: oxygen verify-karaf-version: karaf3 verify-jdkversion: openjdk8 @@ -190,28 +190,20 @@ netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine csit-high-frequency-list-oxygen: > netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen - csit-high-frequency-list-nitrogen: > - netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen - csit-high-frequency-list-carbon: > - netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon csit-sanity-list-fluorine: > openflowplugin-csit-1node-sanity-only-fluorine, distribution-sanity-fluorine csit-sanity-list-oxygen: > openflowplugin-csit-1node-sanity-only-oxygen, distribution-sanity-oxygen - csit-sanity-list-nitrogen: > - openflowplugin-csit-1node-sanity-only-nitrogen, - distribution-sanity-nitrogen - csit-sanity-list-carbon: > - openflowplugin-csit-1node-sanity-only-carbon, - distribution-sanity-carbon csit-weekly-list-fluorine: > controller-csit-1node-notifications-longevity-only-fluorine, controller-csit-3node-drb-partnheal-longevity-only-fluorine, controller-csit-3node-drb-precedence-longevity-only-fluorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine, bgpcep-csit-3node-bgpclustering-longevity-only-fluorine, + distribution-deploy-fluorine, + distribution-offline-fluorine, openflowplugin-csit-1node-longevity-only-fluorine csit-weekly-list-oxygen: > controller-csit-1node-notifications-longevity-only-oxygen, @@ -219,20 +211,6 @@ controller-csit-3node-drb-precedence-longevity-only-oxygen, controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen, bgpcep-csit-3node-bgpclustering-longevity-only-oxygen, + distribution-deploy-oxygen, + distribution-offline-oxygen, openflowplugin-csit-1node-longevity-only-oxygen - csit-weekly-list-nitrogen: > - controller-csit-1node-notifications-longevity-only-nitrogen, - controller-csit-3node-drb-partnheal-longevity-only-nitrogen, - controller-csit-3node-drb-precedence-longevity-only-nitrogen, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen, - bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen, - openflowplugin-csit-1node-longevity-only-nitrogen - csit-weekly-list-carbon: > - controller-csit-1node-notifications-longevity-only-carbon, - controller-csit-3node-cs-chasing-leader-longevity-only-carbon, - controller-csit-3node-cs-partnheal-longevity-only-carbon, - controller-csit-3node-drb-partnheal-longevity-only-carbon, - controller-csit-3node-drb-precedence-longevity-only-carbon, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon, - bgpcep-csit-3node-bgpclustering-longevity-only-carbon, - openflowplugin-csit-1node-longevity-only-carbon diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml index 5be4d2b18..98ba7299c 100644 --- a/jjb/releng-views.yaml +++ b/jjb/releng-views.yaml @@ -466,18 +466,6 @@ regex: '^openflowplugin-.*' <<: *releng_view_common -- view: - name: openflowplugin-carbon - description: 'List of openflowplugin carbon jobs' - regex: 'openflowplugin-.*-carbon' - <<: *releng_view_common - -- view: - name: openflowplugin-nitrogen - description: 'List of openflowplugin nitrogen jobs' - regex: 'openflowplugin-.*-nitrogen' - <<: *releng_view_common - - view: name: openflowplugin-oxygen description: 'List of openflowplugin oxygen jobs' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index bb02d1938..33c6313e2 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -33,23 +33,6 @@ # Used by the release job staging-profile-id: a68d9bc504037 -- project: - name: reservation-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'reservation' - project-name: 'reservation' - branch: 'stable/nitrogen' - mvn-settings: 'reservation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - - # Used by the release job - staging-profile-id: a68d9bc504037 - - project: name: reservation-sonar jobs: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 1e1df4fc9..91b9e89bc 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 0d06515ae..664877e84 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a68e3d1ff55e3 -- project: - name: sdninterfaceapp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'sdninterfaceapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - - # Used by the release job - staging-profile-id: a68e3d1ff55e3 - - project: name: sdninterfaceapp-sonar jobs: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index d9d576e42..56d49f563 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index e6be93e35..e085c8e68 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 0d155f72f..2ee117d46 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 54ea866be..ec17b9949 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -9,8 +9,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 75d1bd250..cb3c8a874 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -39,25 +39,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sfc' - project-name: 'sfc' - branch: 'stable/nitrogen' - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 045e7a8a2..84a9ca9fe 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a68f328cefed6 -- project: - name: snbi-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snbi' - project-name: 'snbi' - branch: 'stable/nitrogen' - mvn-settings: 'snbi-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - - # Used by the release job - staging-profile-id: a68f328cefed6 - - project: name: snbi-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index a66bf0a18..c959329d8 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snmp' - project-name: 'snmp' - branch: 'stable/nitrogen' - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - - # Used by the release job - staging-profile-id: a68fb236b93a6 - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 0eac9f8d5..87431891b 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/nitrogen' - mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a69034a4b6ef5 - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index b6656a02c..4c3271bc6 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index a54a2f697..71d140be3 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 2013f744b..f4488e247 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 2314008f8..922b78895 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index cb63fe7b3..9a4f59331 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 4b0ab51c7..3db08c412 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 9d661fad5..e8b6c02b5 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sxp' - project-name: 'sxp' - branch: 'stable/nitrogen' - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index cf76a47f9..d3bd28873 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -16,40 +16,6 @@ # Used by the release job staging-profile-id: a69113575458e -- project: - name: systemmetrics-oxygen - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: oxygen - branch: 'stable/oxygen' - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - -- project: - name: systemmetrics-nitrogen - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - - project: name: systemmetrics-sonar jobs: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml deleted file mode 100644 index a1d471497..000000000 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: topoprocessing-csit-topology-operations - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'topoprocessing' - - # The functionality under test - functionality: 'topology-operations' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf' - - # Robot custom options - robot-options: '' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 97b7e3630..8ee0a78fb 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a691bbe2328cb -- project: - name: topoprocessing-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/nitrogen' - mvn-settings: 'topoprocessing-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a691bbe2328cb - - project: name: topoprocessing-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index e17f3469b..d1ab65f8d 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -33,23 +33,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-nitrogen - jobs: - - odl-maven-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 6e9a43ba3..e173dc988 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 57f60b335..ad5229bae 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index a034c1b00..6b1c235c4 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 0e35d1c50..a9fbd4761 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 2fe38b4c1..564849dd8 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/nitrogen' - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-sonar jobs: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 8d4fbdf70..b52b0245c 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a693f948563d5 -- project: - name: ttp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'ttp' - project-name: 'ttp' - branch: 'stable/nitrogen' - mvn-settings: 'ttp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - - # Used by the release job - staging-profile-id: a693f948563d5 - - project: name: ttp-sonar jobs: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml deleted file mode 100644 index a7753324a..000000000 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: unimgr-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'unimgr' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Mininet configuration - tools_system_count: 2 - - # Features to install - install-features: 'odl-unimgr-ui' - - # Robot custom options - robot-options: '' diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml deleted file mode 100644 index c221e79d5..000000000 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: unimgr-csit-legato - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'unimgr' - - # The functionality under test - functionality: 'legato' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - install: - - all: - scope: 'all' - - # Mininet configuration - tools_system_count: 2 - - # Features to install - install-features: 'odl-unimgr-ui,odl-unimgr-netvirt' - - # Robot custom options - robot-options: '' - - # mininet image - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index ebc5171c0..4c63ee1e6 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 -- project: - name: unimgr-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/nitrogen' - mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: a695d0a0b8d51 - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 0ef3a94d9..72846d311 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -20,8 +20,6 @@ repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 02a1d544c..c0a3cf701 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -19,8 +19,6 @@ repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index e447eca17..f7dfeb8c5 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -36,25 +36,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'usc' - project-name: 'usc' - branch: 'stable/nitrogen' - mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - - # Used by the release job - staging-profile-id: a697b633b3ffe - - project: name: usc-sonar jobs: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 83d3b707b..edbf3601e 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -17,8 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - all: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 5a372d08d..1b017719b 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a69902281e037 -- project: - name: usecplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/nitrogen' - mvn-settings: 'usecplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - - # Used by the release job - staging-profile-id: a69902281e037 - - project: name: usecplugin-sonar jobs: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index d943a07e5..5083bbfae 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -34,24 +34,6 @@ # Used by the release job staging-profile-id: a69aae2832869 -- project: - name: yang-push-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/nitrogen' - mvn-settings: 'yang-push-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - - # Used by the release job - staging-profile-id: a69aae2832869 - - project: name: yang-push-sonar jobs: diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 2cfe449b6..be65fd219 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -33,23 +33,6 @@ # Used by the release job staging-profile-id: fba306956f98 -- project: - name: yangide-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'yangide' - project-name: 'yangide' - branch: 'stable/nitrogen' - mvn-settings: 'yangide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[yangide] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: fba306956f98 - - project: name: yangide-sonar jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 7d53f7fc5..5a68f2b1e 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,13 +12,10 @@ # Project branches. stream: - # The tested component was only introduced in Carbon. - fluorine: branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index c7d14dab5..0e5ccb848 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -26,34 +26,6 @@ # Used by the release job staging-profile-id: 1271cf710cc09d -- project: - name: yangtools-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'yangtools' - project-name: 'yangtools' - branch: 'v1.2.x' - distribution_branch: 'stable/nitrogen' - mvn-settings: 'yangtools-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [odlparent]' - archive-artifacts: > - **/*.prop - **/*.log - **/target/surefire-reports/*-output.txt - **/target/failsafe-reports/failsafe-summary.xml - **/hs_err_*.log - **/target/feature/feature.xml - - # Used by the release job - staging-profile-id: 1271cf710cc09d - - project: name: yangtools-sonar jobs: -- 2.36.6