From f9510ad2361a13149cd478e9d0863d0efe3dd772 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 3 Oct 2017 17:57:34 +1000 Subject: [PATCH] Remove all ODL Boron Jobs Boron is no longer supported with Nitrogen released. https://lists.opendaylight.org/pipermail/release/2017-October/012572.html Jira: releng-487 Change-Id: I43071182b6603bb89f72b2cd8cb823921a55a3c2 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 4 - jjb/aaa/aaa-csit-idmlite.yaml | 4 - jjb/aaa/aaa.yaml | 27 ---- jjb/alto/alto-csit-setup.yaml | 4 - jjb/alto/alto.yaml | 27 ---- jjb/atrium/atrium.yaml | 27 ---- jjb/autorelease/autorelease-projects.yaml | 8 -- .../autorelease-version-management.yaml | 6 +- jjb/autorelease/prepare-release.sh | 2 +- .../validate-autorelease-boron.yaml | 113 ----------------- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 56 --------- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 9 -- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 5 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 11 -- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 14 --- jjb/bgpcep/bgpcep-patch-test.yaml | 4 - jjb/bgpcep/bgpcep-pcepy.yaml | 6 +- jjb/bgpcep/bgpcep.yaml | 33 ----- jjb/capwap/capwap-csit-ac.yaml | 4 - jjb/capwap/capwap.yaml | 27 ---- jjb/cardinal/cardinal.yaml | 27 ---- jjb/centinel/centinel-csit-basic.yaml | 4 - jjb/centinel/centinel.yaml | 27 ---- jjb/controller/controller-csit-akka1.yaml | 4 - .../controller-csit-clustering.yaml | 4 - ...ler-csit-periodic-dsbenchmark-cluster.yaml | 4 - .../controller-csit-periodic-dsbenchmark.yaml | 4 - .../controller-csit-rest-cars-perf.yaml | 4 - .../controller-csit-rest-clust-cars-perf.yaml | 4 - jjb/controller/controller.yaml | 27 ---- jjb/coretutorials/coretutorials.yaml | 26 ---- jjb/didm/didm-csit-discovery.yaml | 4 - jjb/didm/didm.yaml | 27 ---- jjb/dlux/dlux.yaml | 27 ---- jjb/docs/docs-rtd.yaml | 2 - jjb/eman/eman.yaml | 27 ---- jjb/faas/faas.yaml | 27 ---- jjb/genius/genius-csit-genius.yaml | 4 - jjb/genius/genius-patch-test.yaml | 4 - jjb/genius/genius.yaml | 32 ----- ...groupbasedpolicy-csit-1node-openstack.yaml | 5 - .../groupbasedpolicy-csit-3node.yaml | 4 - .../groupbasedpolicy-csit-6node.yaml | 4 - .../groupbasedpolicy-csit-clustering.yaml | 4 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 32 ----- jjb/honeycomb/vbd/vbd.yaml | 27 ---- jjb/infrautils/infrautils.yaml | 27 ---- jjb/integration/csit-jobs-boron.lst | 119 ------------------ .../distribution-csit-userfeatures.yaml | 6 - .../distribution/distribution.yaml | 3 - jjb/integration/integration-test-jobs.yaml | 118 ----------------- jjb/iotdm/iotdm.yaml | 27 ---- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 7 -- jjb/jsonrpc/jsonrpc.yaml | 26 ---- .../l2switch-csit-host-scalability-daily.yaml | 4 - jjb/l2switch/l2switch-csit-scalability.yaml | 4 - jjb/l2switch/l2switch-csit-switch.yaml | 4 - jjb/l2switch/l2switch-patch-test.yaml | 4 - jjb/l2switch/l2switch.yaml | 32 ----- jjb/lacp/lacp-csit-lacp.yaml | 4 - jjb/lacp/lacp.yaml | 27 ---- .../lispflowmapping-csit-msmr.yaml | 4 - .../lispflowmapping-csit-performance.yaml | 4 - jjb/lispflowmapping/lispflowmapping.yaml | 28 ----- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 - jjb/mdsal/mdsal.yaml | 27 ---- .../messaging4transport-csit-basic.yaml | 4 - .../messaging4transport.yaml | 27 ---- jjb/natapp/natapp-csit-basic.yaml | 4 - jjb/natapp/natapp.yaml | 27 ---- jjb/nemo/nemo-csit-engine.yaml | 4 - jjb/nemo/nemo.yaml | 27 ---- jjb/netconf/netconf-cluster-stress.yaml | 4 - jjb/netconf/netconf-clustering-scale.yaml | 4 - jjb/netconf/netconf-clustering.yaml | 4 - jjb/netconf/netconf-patch-test.yaml | 4 - jjb/netconf/netconf-scale.yaml | 11 -- jjb/netconf/netconf-userfeatures.yaml | 12 -- jjb/netconf/netconf.yaml | 27 ---- jjb/netide/netide-csit-basic.yaml | 4 - jjb/netide/netide.yaml | 27 ---- .../netvirt-csit-hwvtep-openstack.yaml | 63 ---------- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 62 --------- jjb/netvirt/netvirt-full-integration.yaml | 6 - .../netvirt-legacy-csit-clustering.yaml | 29 ----- .../netvirt-legacy-csit-multi-openstack.yaml | 53 -------- jjb/netvirt/netvirt-legacy-csit.yaml | 32 ----- jjb/netvirt/netvirt-patch-test.yaml | 29 ----- jjb/netvirt/netvirt.yaml | 3 - jjb/neutron/neutron.yaml | 27 ---- jjb/next/next.yaml | 27 ---- jjb/nic/nic-csit-basic.yaml | 4 - jjb/nic/nic.yaml | 27 ---- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 4 - jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 4 - jjb/ocpplugin/ocpplugin.yaml | 27 ---- jjb/odlparent/odlparent.yaml | 29 ----- jjb/of-config/of-config-csit-basic.yaml | 4 - jjb/of-config/of-config.yaml | 27 ---- jjb/ofextensions/circuitsw/circuitsw.yaml | 25 ---- jjb/openflowjava/openflowjava.yaml | 27 ---- ...ugin-csit-bulkomatic-clustering-daily.yaml | 4 - ...csit-bulkomatic-clustering-perf-daily.yaml | 4 - ...flowplugin-csit-bulkomatic-perf-daily.yaml | 4 - .../openflowplugin-csit-cbench-daily.yaml | 4 - .../openflowplugin-csit-clustering.yaml | 4 - ...openflowplugin-csit-flow-services-frs.yaml | 4 - .../openflowplugin-csit-flow-services.yaml | 4 - ...lowplugin-csit-link-scalability-daily.yaml | 4 - .../openflowplugin-csit-longevity.yaml | 4 - ...n-csit-restconf-clustering-perf-daily.yaml | 4 - ...enflowplugin-csit-restconf-perf-daily.yaml | 4 - .../openflowplugin-csit-sanity.yaml | 4 - .../openflowplugin-csit-scalability.yaml | 4 - ...csit-scale-stats-collection-daily-frs.yaml | 4 - ...gin-csit-scale-stats-collection-daily.yaml | 4 - ...nflowplugin-csit-sw-scalability-daily.yaml | 4 - .../openflowplugin-patch-test.yaml | 4 - jjb/openflowplugin/openflowplugin.yaml | 31 ----- jjb/opflex/opflex-custom.yaml | 5 - jjb/opflex/opflex-dependencies.yaml | 6 - jjb/opflex/opflex.yaml | 5 - jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 - jjb/ovsdb/ovsdb-full-integration.yaml | 6 - jjb/ovsdb/ovsdb-patch-test.yaml | 4 - jjb/ovsdb/ovsdb.yaml | 27 ---- jjb/packaging/packaging.yaml | 1 - jjb/packaging/puppet.yaml | 2 - jjb/packetcable/packetcable-csit-pcmm.yaml | 4 - jjb/packetcable/packetcable.yaml | 27 ---- jjb/persistence/persistence.yaml | 27 ---- jjb/releng-defaults.yaml | 6 - jjb/reservation/reservation.yaml | 26 ---- .../sdninterfaceapp-csit-basic.yaml | 4 - jjb/sdninterfaceapp/sdninterfaceapp.yaml | 27 ---- jjb/sfc/sfc-csit-rest-basic.yaml | 4 - jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 27 ---- jjb/snbi/snbi.yaml | 27 ---- jjb/snmp/snmp.yaml | 27 ---- jjb/snmp4sdn/snmp4sdn.yaml | 27 ---- jjb/sxp/sxp-csit-basic.yaml | 4 - jjb/sxp/sxp-csit-clustering.yaml | 4 - jjb/sxp/sxp-csit-filtering.yaml | 4 - jjb/sxp/sxp-csit-topology.yaml | 4 - jjb/sxp/sxp.yaml | 27 ---- ...opoprocessing-csit-topology-operation.yaml | 4 - jjb/topoprocessing/topoprocessing.yaml | 27 ---- jjb/tsdr/tsdr-csit-cassandra.yaml | 4 - jjb/tsdr/tsdr-csit-hbase.yaml | 4 - jjb/tsdr/tsdr-csit-hsqldb.yaml | 4 - jjb/tsdr/tsdr.yaml | 27 ---- jjb/ttp/ttp.yaml | 27 ---- jjb/unimgr/unimgr-csit-basic.yaml | 4 - jjb/unimgr/unimgr-csit-legato.yaml | 4 - jjb/unimgr/unimgr.yaml | 27 ---- jjb/usc/usc-csit-channel.yaml | 4 - jjb/usc/usc-csit-tcp.yaml | 4 - jjb/usc/usc-csit-udp.yaml | 29 ----- jjb/usc/usc.yaml | 27 ---- jjb/usecplugin/usecplugin-csit-basic.yaml | 4 - jjb/usecplugin/usecplugin.yaml | 27 ---- jjb/vtn/vtn-csit-3node-manager.yaml | 4 - jjb/vtn/vtn-csit-coordinator.yaml | 5 - jjb/vtn/vtn-csit-manager.yaml | 4 - jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 4 - jjb/vtn/vtn-patch-test.yaml | 7 -- jjb/vtn/vtn.yaml | 31 ----- jjb/yang-push/yang-push.yaml | 27 ---- jjb/yangide/yangide.yaml | 26 ---- jjb/yangtools/yangtools.yaml | 29 ----- 172 files changed, 10 insertions(+), 2730 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-boron.yaml delete mode 100644 jjb/integration/csit-jobs-boron.lst delete mode 100644 jjb/netvirt/netvirt-legacy-csit-clustering.yaml delete mode 100644 jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml delete mode 100644 jjb/netvirt/netvirt-legacy-csit.yaml delete mode 100644 jjb/usc/usc-csit-udp.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index d19151bd8..29feb59f1 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 387481392..9534251ba 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 1cd045d91..4885ca31f 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -78,33 +78,6 @@ email-upstream: '[aaa] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: aaa-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'aaa' - project-name: 'aaa' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: aaa-sonar jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index d836f2629..816563a8b 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index ef206e8df..57f7b1453 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -78,33 +78,6 @@ email-upstream: '[alto] [l2switch]' archive-artifacts: '' -- project: - name: alto-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'alto' - project-name: 'alto' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'alto-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - archive-artifacts: '' - - project: name: alto-sonar jobs: diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index da93fc970..03004a9e3 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -78,33 +78,6 @@ email-upstream: '[atrium]' archive-artifacts: '' -- project: - name: atrium-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'atrium' - project-name: 'atrium' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[atrium]' - archive-artifacts: '' - - project: name: atrium-sonar jobs: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index c20ec5eed..1bf9b7cf5 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -31,14 +31,6 @@ integration-test: carbon karaf-version: karaf3 extra-mvn-opts: -Dskip.karaf4.featureTest=true - - boron: - # Only run once a week since Boron is in maintenance mode - cron: 'H 12 * * 0' - next-release-tag: Boron-SR5 - branch: 'stable/boron' - jdk: 'openjdk8' - integration-test: boron - karaf-version: karaf3 project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 7093d2c97..43e2eab7f 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -9,5 +9,9 @@ toxdir: 'scripts/version_management' stream: - - boron: + - oxygen: branch: master + - nitrogen: + branch: stable/nitrogen + - carbon: + branch: stable/carbon diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh index 780fd31f4..51248b15e 100644 --- a/jjb/autorelease/prepare-release.sh +++ b/jjb/autorelease/prepare-release.sh @@ -41,7 +41,7 @@ echo "$RELEASE_TAG" # Nitrogen onwards we do not want to use the release tag so simply need to # strip xml files of -SNAPSHOT tags. case "$RELEASE_TAG" in - Boron*|Carbon*) + Carbon*) lftools version release "$RELEASE_TAG" ;; *) diff --git a/jjb/autorelease/validate-autorelease-boron.yaml b/jjb/autorelease/validate-autorelease-boron.yaml deleted file mode 100644 index 84f90842f..000000000 --- a/jjb/autorelease/validate-autorelease-boron.yaml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-boron - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: boron - branch: stable/boron - project-name: - - aaa: - project: aaa - - alto: - project: alto - - atrium: - project: atrium - - bgpcep: - project: bgpcep - - capwap: - project: capwap - - cardinal: - project: cardinal - - centinel: - project: centinel - - controller: - project: controller - - didm: - project: didm - - dlux: - project: dlux - - eman: - project: eman - - faas: - project: faas - - genius: - project: genius - - groupbasedpolicy: - project: groupbasedpolicy - - honeycomb-vbd: - project: honeycomb/vbd - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - iotdm: - project: iotdm - - l2switch: - project: l2switch - - lacp: - project: lacp - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - natapp: - project: natapp - - nemo: - project: nemo - - netconf: - project: netconf - - netide: - project: netide - - netvirt: - project: netvirt - - neutron: - project: neutron - - next: - project: next - - nic: - project: nic - - ocpplugin: - project: ocpplugin - - odlparent: - project: odlparent - - of-config: - project: of-config - - openflowjava: - project: openflowjava - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - packetcable: - project: packetcable - - sdninterfaceapp: - project: sdninterfaceapp - - sfc: - project: sfc - - snbi: - project: snbi - - snmp: - project: snmp - - snmp4sdn: - project: snmp4sdn - - sxp: - project: sxp - - topoprocessing: - project: topoprocessing - - tsdr: - project: tsdr - - ttp: - project: ttp - - unimgr: - project: unimgr - - usc: - project: usc - - usecplugin: - project: usecplugin - - vtn: - project: vtn - - yang-push: - project: yang-push - - yangtools: - project: yangtools diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 104b5597b..34d879639 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -22,25 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-data-change-counter, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-netconf-connector-all - robot-options: > - -v USE_NETCONF_CONNECTOR:True - -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 - -v REPETITIONS_CHANGE_COUNT_SINGLE:3 - -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 - -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 - -v REPETITIONS_CHANGE_COUNT_MANY:10 - -v MULTIPLICITY_CHANGE_COUNT_MANY:600 - -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 install: - all: @@ -88,24 +69,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-bgpcep-data-change-counter, - odl-netconf-connector-all - robot-options: > - -v USE_NETCONF_CONNECTOR:True - -v COUNT:1000000 - -v INSERT:10 - -v WITHDRAW:9 - -v PREFILL:10 - -v UPDATE:single - -v TEST_DURATION_MULTIPLIER:4 install: - all: @@ -163,24 +126,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-bgpcep-data-change-counter, - odl-netconf-connector-all - robot-options: > - -v USE_NETCONF_CONNECTOR:True - -v COUNT:1000000 - -v INSERT:10 - -v WITHDRAW:9 - -v PREFILL:10 - -v UPDATE:single - -v TEST_DURATION_MULTIPLIER:4 install: - all: @@ -217,4 +162,3 @@ 02-plot-yaxis: 'Updates per second' 02-plot-group: 'BGP Scaling test suite' 02-plot-data-file: 'performance-bgp.csv' - diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index c0fdcc41a..3a8a0d17b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -22,15 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-netconf-clustered-topology install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index ad642be0b..3b5691e79 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -22,11 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index cfb744181..5e4743647 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -22,11 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep' install: - all: @@ -71,11 +66,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep' install: - all: @@ -96,4 +86,3 @@ # Controller configuration odl_system_flavor: 8 GB General Purpose v1 - diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 6ea4a1ba7..732783b5a 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -25,20 +25,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-pcep-all, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-bgpcep-pcep, - odl-netconf-connector-all, - odl-bgpcep-bmp, - odl-jolokia - robot-options: '-v USE_NETCONF_CONNECTOR:True' install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 3f094000b..f308d8b0c 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -19,10 +19,6 @@ branch: 'stable/carbon' jdk: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - karaf-version: karaf3 feature: - bgp: diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml index 780ca7050..26a95a803 100644 --- a/jjb/bgpcep/bgpcep-pcepy.yaml +++ b/jjb/bgpcep/bgpcep-pcepy.yaml @@ -6,8 +6,10 @@ stream: # Pcepy was removed in Carbon. - - boron: - branch: 'stable/boron' + - oxygen: + branch: master + - nitrogen: + branch: stable/nitrogen toxdir: 'pcep/pcepy' project: 'bgpcep' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 8e5b708c0..16d8dcb65 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -96,39 +96,6 @@ email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' archive-artifacts: '' -- project: - name: bgpcep-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - archive-artifacts: '' - - project: name: bgpcep-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index c2cf2c30b..938798744 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 1abc7a746..2e7a81e06 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -78,33 +78,6 @@ email-upstream: '[capwap]' archive-artifacts: '' -- project: - name: capwap-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'capwap' - project-name: 'capwap' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - archive-artifacts: '' - - project: name: capwap jobs: diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index b37191925..29610f47f 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -78,33 +78,6 @@ email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' archive-artifacts: '' -- project: - name: cardinal-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'cardinal' - project-name: 'cardinal' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' - email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - archive-artifacts: '' - - project: name: cardinal-sonar jobs: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 8ef0696ab..c1c29d3a5 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 70074f901..395edf0b8 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -78,33 +78,6 @@ email-upstream: '[centinel]' archive-artifacts: '' -- project: - name: centinel-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'centinel' - project-name: 'centinel' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[centinel]' - archive-artifacts: '' - - project: name: centinel-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index f0f64fac8..3967efe5c 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 04c350315..6a0fd9205 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index 8d09d16de..f0b6656cb 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 80443d391..75d2a927b 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 61e6c563f..dd4a2256c 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 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 e3ce26442..a5769964d 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 5f7298626..a9674af64 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -78,33 +78,6 @@ email-upstream: '[controller] [odlparent] [yangtools] [aaa]' archive-artifacts: '' -- project: - name: controller-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'controller' - project-name: 'controller' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - archive-artifacts: '' - - project: name: controller-sonar jobs: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index e90d1c438..87d57d208 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -75,32 +75,6 @@ email-upstream: '[coretutorials]' archive-artifacts: '' -- project: - name: coretutorials-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - archive-artifacts: '' - - project: name: coretutorials-sonar jobs: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index c59eb3f1f..d10ab897d 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 7fefaf3e4..a9d2bb573 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -78,33 +78,6 @@ email-upstream: '[didm]' archive-artifacts: '' -- project: - name: didm-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'didm' - project-name: 'didm' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'didm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - archive-artifacts: '' - - project: name: didm-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index e80f58ced..3a1a73e00 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -78,33 +78,6 @@ email-upstream: '[dlux] [odlparent]' archive-artifacts: '' -- project: - name: dlux-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'dlux' - project-name: 'dlux' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - archive-artifacts: '' - - project: name: dlux-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 4725f8235..dee12dace 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: stable/nitrogen - carbon: branch: stable/carbon - - boron: - branch: stable/boron project: docs project-name: docs diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 5c270437c..63a73ccbf 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -78,33 +78,6 @@ email-upstream: '[eman]' archive-artifacts: '' -- project: - name: eman-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'eman' - project-name: 'eman' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'eman-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[eman]' - archive-artifacts: '' - - project: name: eman-sonar jobs: diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 4097be1c5..f9e4ddfd2 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -78,33 +78,6 @@ email-upstream: '[faas]' archive-artifacts: '' -- project: - name: faas-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'faas' - project-name: 'faas' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'faas-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - archive-artifacts: '' - - project: name: faas-sonar jobs: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 614d8ab7c..863f802e3 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -28,10 +28,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index f93b75aff..2074fe8c2 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -19,10 +19,6 @@ branch: 'stable/carbon' os-branch: 'ocata' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - os-branch: 'newton' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index d777b6c0c..b9b4197bd 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -93,38 +93,6 @@ email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' archive-artifacts: '' -- project: - name: genius-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'genius' - project-name: 'genius' - karaf-version: karaf3 - branch: 'stable/boron' - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'genius-settings' - mvn-goals: 'clean install' - 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]' - archive-artifacts: '' - - project: name: genius-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 004193db7..6cafff929 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -32,11 +32,6 @@ jre: 'openjdk8' karaf-version: karaf3 install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' openstack: - newton: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index e31ffacf0..b79672ed9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index ddc1237d6..47d42d7e6 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 0d0459ece..0fb50b7af 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index c3c5fa3a2..1bd9015e3 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -93,38 +93,6 @@ email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' -- project: - name: groupbasedpolicy-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - archive-artifacts: '' - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 737576a13..961591d84 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -78,33 +78,6 @@ email-upstream: '[vbd]' archive-artifacts: '' -- project: - name: vbd-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - archive-artifacts: '' - - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 33d0894cf..75b913502 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -78,33 +78,6 @@ email-upstream: '[infrautils] [odlparent]' archive-artifacts: '' -- project: - name: infrautils-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - archive-artifacts: '' - - project: name: infrautils-sonar jobs: diff --git a/jjb/integration/csit-jobs-boron.lst b/jjb/integration/csit-jobs-boron.lst deleted file mode 100644 index 770cc259b..000000000 --- a/jjb/integration/csit-jobs-boron.lst +++ /dev/null @@ -1,119 +0,0 @@ -aaa-csit-1node-authn-all-boron, -aaa-csit-1node-idmlite-all-boron, -alto-csit-1node-setup-all-boron, -bgpcep-csit-1node-periodic-bgp-ingest-all-boron, -bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-boron, -bgpcep-csit-1node-periodic-throughpcep-all-boron, -bgpcep-csit-1node-userfeatures-all-boron, -bgpcep-csit-3node-periodic-bgpclustering-all-boron, -bgpcep-csit-3node-periodic-bgpclustering-ha-only-boron, -capwap-csit-1node-ac-all-boron, -centinel-csit-1node-basic-all-boron, -controller-csit-1node-akka1-all-boron, -controller-csit-1node-periodic-benchmark-all-boron, -controller-csit-1node-rest-cars-perf-all-boron, -controller-csit-3node-clustering-all-boron, -controller-csit-3node-periodic-benchmark-all-boron, -controller-csit-3node-rest-clust-cars-perf-only-boron, -didm-csit-1node-discovery-only-boron, -distribution-csit-1node-userfeatures-all-boron, -genius-csit-1node-upstream-all-boron, -genius-csit-3node-upstream-all-boron, -groupbasedpolicy-csit-1node-3-node-all-boron, -groupbasedpolicy-csit-1node-6node-all-boron, -groupbasedpolicy-csit-1node-openstack-newton-openstack-boron, -groupbasedpolicy-csit-3node-clustering-all-boron, -l2switch-csit-1node-periodic-host-scalability-daily-only-boron, -l2switch-csit-1node-scalability-all-boron, -l2switch-csit-1node-switch-all-boron, -lacp-csit-1node-lacp-all-boron, -lispflowmapping-csit-1node-msmr-all-boron, -lispflowmapping-csit-1node-performance-only-boron, -lispflowmapping-csit-3node-msmr-all-boron, -mdsal-csit-1node-periodic-bindingv1-only-boron, -messaging4transport-csit-1node-basic-all-boron, -natapp-csit-1node-basic-all-boron, -nemo-csit-1node-engine-all-boron, -netconf-csit-1node-periodic-scale-all-boron, -netconf-csit-1node-userfeatures-all-boron, -netconf-csit-3node-cluster-stress-all-boron, -netconf-csit-3node-clustering-all-boron, -netconf-csit-3node-periodic-clustering-scale-all-boron, -netide-csit-1node-basic-all-boron, -netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-boron, -netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-boron, -netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron, -netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-boron, -netvirt-csit-1node-openstack-newton-upstream-learn-boron, -netvirt-csit-1node-openstack-newton-upstream-stateful-boron, -netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron, -netvirt-csit-1node-openstack-newton-upstream-transparent-boron, -netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron, -netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron, -netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron, -netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-boron, -netvirt-csit-3node-openstack-newton-upstream-learn-boron, -netvirt-csit-3node-openstack-newton-upstream-stateful-boron, -netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-boron, -netvirt-csit-3node-openstack-newton-upstream-transparent-boron, -netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron, -netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron, -netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron, -netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron, -netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron, -netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron, -netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron, -netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron, -netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron, -netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-boron, -netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron, -netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron, -netvirt-legacy-csit-1node-openstack-basic-all-boron, -netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-boron, -netvirt-legacy-csit-1node-openstack-newton-upstream-boron, -netvirt-legacy-csit-1node-openstack-ocata-upstream-boron, -netvirt-legacy-csit-3node-clustering-only-boron, -netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron, -netvirt-legacy-csit-3node-openstack-newton-upstream-boron, -netvirt-legacy-csit-3node-openstack-ocata-upstream-boron, -nic-csit-1node-basic-all-boron, -ocpplugin-csit-1node-get-all-boron, -ocpplugin-csit-1node-scalability-all-boron, -of-config-csit-1node-basic-all-boron, -openflowplugin-csit-1node-flow-services-all-boron, -openflowplugin-csit-1node-flow-services-frs-only-boron, -openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-boron, -openflowplugin-csit-1node-periodic-cbench-daily-only-boron, -openflowplugin-csit-1node-periodic-link-scalability-daily-only-boron, -openflowplugin-csit-1node-periodic-restconf-perf-daily-only-boron, -openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-boron, -openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-boron, -openflowplugin-csit-1node-periodic-sw-scalability-daily-only-boron, -openflowplugin-csit-1node-scalability-only-boron, -openflowplugin-csit-3node-clustering-only-boron, -openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron, -openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-boron, -openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-boron, -ovsdb-csit-1node-upstream-southbound-all-boron, -ovsdb-csit-3node-upstream-clustering-only-boron, -packetcable-csit-1node-pcmm-all-boron, -sdninterfaceapp-csit-1node-basic-only-boron, -sfc-csit-3node-rest-basic-all-boron, -sxp-csit-1node-basic-all-boron, -sxp-csit-1node-filtering-all-boron, -sxp-csit-1node-topology-all-boron, -sxp-csit-3node-periodic-clustering-all-boron, -topoprocessing-csit-1node-topology-operations-all-boron, -tsdr-csit-1node-cassandra-datastore-only-boron, -tsdr-csit-1node-hbase-datastore-all-boron, -tsdr-csit-1node-hsqldb-datastore-all-boron, -unimgr-csit-1node-basic-all-boron, -unimgr-csit-1node-legato-all-boron, -usc-csit-1node-channel-all-boron, -usc-csit-1node-tcp-all-boron, -usc-csit-1node-udp-all-boron, -usecplugin-csit-1node-basic-all-boron, -vtn-csit-1node-coordinator-only-boron, -vtn-csit-1node-manager-all-boron, -vtn-csit-1node-openstack-newton-neutron-boron, -vtn-csit-3node-manager-all-boron, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 39ef9bcc9..0a0d61305 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -22,12 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia' - robot-options: '-v USE_NETCONF_CONNECTOR:True' # TODO: Add Beryllium when everything is backported there. diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index 1dcfe42cb..b3fa5d273 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -31,6 +31,3 @@ - carbon: branch: stable/carbon karaf-version: karaf3 - - boron: - branch: stable/boron - karaf-version: karaf3 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 98e910243..daf5de215 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -6,7 +6,6 @@ test-branch: master jobs: - '{project-name}-verify-tox-master' - - 'integration-csit-verify-1node-library' - 'integration-distribution-test-{stream}' - 'integration-sanity-test-{stream}' - 'integration-patch-test-{stream}' @@ -46,126 +45,9 @@ csit-weekly-list: '{csit-weekly-list-carbon}' csit-high-frequency-list: '{csit-high-frequency-list-carbon}' - - boron: - branch: 'stable/boron' - karaf-version: karaf3 - jdk: 'openjdk8' - jre: 'openjdk8' - csit-blacklist: longevity gate sanity jsonrpc - csit-list: !include: csit-jobs-boron.lst - csit-sanity-list: '{csit-sanity-list-boron}' - csit-weekly-list: '{csit-weekly-list-boron}' - csit-high-frequency-list: '' - schedule-high-frequency: '' - # tools system image tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 -# Template: integration-csit-verify-1node-library -# Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables) -# Operation: This job template performs a base openflow test when there is a change in the libraries folder - -- job-template: - name: 'integration-csit-verify-1node-library' - - project-type: freestyle - node: centos7-robot-2c-2g - - # {stream} is already defined as a composite object, it cannot be overriden. - dist-stream: boron - # This is not a template, so define branch, scope and jre for distribution to test with. - branch: stable/boron - scope: only - jre: openjdk8 - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{test-branch}' - refspec: 'refs/heads/{test-branch}' - artifacts: '{archive-artifacts}' - - integration-distribution-branch: - branch: '{verify-branch}' - - integration-distribution-stream: - stream: '{verify-stream}' - - integration-bundle-url: - bundle-url: '{bundle-url}' - - integration-controller-scope: - controller-scope: '{scope}' - - integration-controller-features: - controller-features: > - odl-clustering-test-app, - odl-openflowplugin-flow-services-ui, - odl-openflowplugin-app-table-miss-enforcer, - odl-bgpcep-pcep, - odl-bgpcep-bgp, - odl-netconf-connector-all - # when upgrading to carbon you should replace odl-netconf-connector-all with odl-netconf-topology - # and change USE_NETCONF_CONNECTOR to False in test-options - - integration-test-options: - test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True' - - integration-stream-test-plan: - stream-test-plan: 'test-libraries-{verify-stream}.txt' - - integration-test-plan: - test-plan: 'test-libraries.txt' - - integration-patch-refspec: - branch: '$GERRIT_REFSPEC' - - integration-jdk-version: - jdkversion: '{jre}' - - distribution-karaf-version: - karaf-version: '{verify-karaf-version}' - - scm: - - integration-gerrit-scm: - basedir: 'test' - refspec: '$PATCHREFSPEC' - branch: '{test-branch}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - integration-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{test-branch}' - files: 'csit/libraries/*' - - builders: - - integration-infra-stack: - stack-template: '{stack-template}' - vm_0_count: '1' - vm_0_flavor: '{odl_system_flavor}' - vm_0_image: '{odl_system_image}' - vm_1_count: '{tools_system_count}' - vm_1_flavor: '{tools_system_flavor}' - vm_1_image: '{tools_system_image}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-get-slave-addresses - - inject: - properties-file: 'slave_addresses.txt' - - integration-detect-variables - - integration-deploy-controller-run-test - - integration-cleanup-tmp - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[integration]' - - integration-csit-archive-build - - lf-infra-publish - # Template: integration-distribution-test-{stream} # Goal: Verify a distribution through all system test available # Operation: This template takes a distribution and passes all available system test diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 526fd4efc..7af120d48 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -78,33 +78,6 @@ email-upstream: '[iotdm] [aaa]' archive-artifacts: '' -- project: - name: iotdm-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'iotdm' - project-name: 'iotdm' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'aaa-merge-{stream}' - email-upstream: '[iotdm] [aaa]' - archive-artifacts: '' - - project: name: iotdm-sonar jobs: diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 72f16bdce..4dcb2780f 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -24,7 +24,6 @@ karaf-version: karaf3 # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip' - - carbon: branch: 'stable/carbon' jre: 'openjdk8' @@ -32,12 +31,6 @@ # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - # yamllint disable-line rule:line-length - bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-boron/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/0.9.0-SNAPSHOT/jsonrpc-karaf-0.9.0-SNAPSHOT.zip' install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 96f5c13b4..5e1f1065e 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -75,32 +75,6 @@ email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' archive-artifacts: '' -- project: - name: jsonrpc-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - project: 'jsonrpc' - project-name: 'jsonrpc' - stream: boron - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' - email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - archive-artifacts: '' - - 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 a32ed257f..f2e50847b 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index c09dbf4bf..8a14298da 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 2c73bc107..af91a3d9d 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 47a8aeab6..59f6007cc 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -19,10 +19,6 @@ branch: 'stable/carbon' jdk: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - karaf-version: karaf3 feature: - all: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 088249473..460e615cb 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -93,38 +93,6 @@ email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: l2switch-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - archive-artifacts: '' - - project: name: l2switch-sonar jobs: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 2eb271518..a379ff83d 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index a092116b3..10cb7dd24 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -78,33 +78,6 @@ email-upstream: '[lacp] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: lacp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'lacp' - project-name: 'lacp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - mvn-settings: 'lacp-settings' - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - archive-artifacts: '' - - project: name: lacp-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 5e2f7f9ec..dd3f02f29 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 2da03bc89..722794c0b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 5c26d2193..5cbb2efbc 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -81,34 +81,6 @@ archive-artifacts: '' build-node: centos7-java-builder-4c-8g -- project: - name: lispflowmapping-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - archive-artifacts: '' - build-node: centos7-java-builder-4c-8g - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 353716903..fb2493873 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -23,11 +23,6 @@ jre: 'openjdk8' karaf-version: karaf3 robot-options: '-v JAVA_OPTIONS:-Xmx6656m' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - robot-options: '-v JAVA_OPTIONS:-Xmx6656m' install: - only: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 4117adc40..37704cd81 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -78,33 +78,6 @@ email-upstream: '[mdsal] [odlparent] [yangtools]' archive-artifacts: '' -- project: - name: mdsal-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - archive-artifacts: '' - - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index da33a84e4..b736e74fb 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 09fdb9656..5a3c3bdc9 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -78,33 +78,6 @@ email-upstream: '[messaging4transport]' archive-artifacts: '' -- project: - name: messaging4transport-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - archive-artifacts: '' - - project: name: messaging4transport-sonar jobs: diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index 18e1f1bc5..6e16dcea6 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 4d0544f1e..68b25c20a 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -78,33 +78,6 @@ email-upstream: '[natapp] [openflowplugin]' archive-artifacts: '' -- project: - name: natapp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'natapp' - project-name: 'natapp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[natapp] [openflowplugin]' - archive-artifacts: '' - - project: name: natapp-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 6e15e0c5a..9f4509d30 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 7a426cb93..89f541030 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -78,33 +78,6 @@ email-upstream: '[nemo]' archive-artifacts: '' -- project: - name: nemo-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'nemo' - project-name: 'nemo' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - archive-artifacts: '' - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 553106a95..6580c76ba 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index bde252c8e..6b9fb1af8 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 141e30170..90583ad30 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 4a29408ba..e406a318e 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -19,10 +19,6 @@ branch: 'stable/carbon' jdk: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - karaf-version: karaf3 feature: - core: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index e1677af41..298c32fbe 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -22,17 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-clustering-test-app, - odl-netconf-mdsal, - odl-netconf-connector-all, - odl-netconf-topology - robot-options: '-v USE_NETCONF_CONNECTOR:True' install: - all: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 5c34f200e..a8ce3cd34 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -25,18 +25,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-netconf-mdsal, - odl-mdsal-apidocs, - odl-clustering-test-app, - odl-netconf-connector-all, - odl-netconf-topology - robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index f34987c73..d8d422588 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -78,33 +78,6 @@ email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' archive-artifacts: '' -- project: - name: netconf-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'netconf' - project-name: 'netconf' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - archive-artifacts: '' - - project: name: netconf-sonar jobs: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index fffd7f02c..7857f5281 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 8f02f86da..a7436e679 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -78,33 +78,6 @@ email-upstream: '[netide] [openflowjava]' archive-artifacts: '' -- project: - name: netide-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'netide' - project-name: 'netide' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'netide-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - archive-artifacts: '' - - project: name: netide-sonar jobs: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 52cee01d9..828cb44ab 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -186,66 +186,3 @@ # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled enable-networking-l2gw: 'yes' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-boron - jobs: - - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' - - project: 'netvirt' - - stream: 'boron' - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - topology: - - 1node: - openstack_system1_count: 1 - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system1_count: 1 - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - testplan: '{project}-{topology}-l2gw-openstack.txt' - - functionality: - - upstream-transparent: - schedule: '' - sg-mode: 'transparent' - - upstream-stateful: - schedule: '' - sg-mode: 'stateful' - - upstream-learn: - schedule: '' - sg-mode: 'learn' - - gate-stateful: - schedule: '' - sg-mode: 'stateful' - - openstack: - - newton: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - - newton-nodl-v2: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - odl-ml2-driver-version: 'v2' - - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528' - security-group-mode: '{sg-mode}' - - tools_system_count: 2 - tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548' - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - enable-openstack-services: 'neutron,nova,l2gw-plugin' - diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 57be545f5..6fcf8e335 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -185,68 +185,6 @@ enable-openstack-compute-services: 'placement-client' security-group-mode: '{sg-mode}' -- project: - name: netvirt-csit-openstack-integration-boron - jobs: - - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' - - project: 'netvirt' - stream: 'boron' - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - testplan: '{project}-{topology}-openstack.txt' - - functionality: - - upstream-transparent: - sg-mode: 'transparent' - - upstream-stateful: - sg-mode: 'stateful' - - upstream-stateful-snat-conntrack: - sg-mode: 'stateful' - odl-snat-mode: 'conntrack' - - upstream-learn: - sg-mode: 'learn' - - gate-learn: - sg-mode: 'learn' - - gate-transparent: - sg-mode: 'transparent' - - gate-stateful: - sg-mode: 'stateful' - - gate-minimal-transparent: - sg-mode: 'transparent' - testplan: '{project}-{topology}-minimal-openstack.txt' - - gate-tempest-transparent: - sg-mode: 'transparent' - testplan: '{project}-{topology}-tempest-openstack.txt' - - openstack: - - newton: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - - newton-nodl-v2: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - odl-ml2-driver-version: 'v2' - - enable-openstack-services: 'tempest' - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528' - security-group-mode: '{sg-mode}' - - project: name: netvirt-csit-sfc-openstack-integration jobs: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index ab8f5c762..53d543e81 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -17,12 +17,6 @@ jdks: - openjdk8 karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jdk: openjdk8 - jdks: - - openjdk8 - karaf-version: karaf3 project: 'netvirt' archive-artifacts: '*.log **/target/surefire-reports/*.txt' diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml deleted file mode 100644 index b9f23fc7f..000000000 --- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: netvirt-legacy-csit-clustering - jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-3node-{functionality}' - - # The project name - project: 'netvirt-legacy' - - # The functionality under test - functionality: 'clustering' - - # Project branches - stream: - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - # Robot custom options - robot-options: '' diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml deleted file mode 100644 index 34c1fda88..000000000 --- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -- project: - name: netvirt-legacy-csit-openstack-integration - jobs: - - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' - - # The project name - project: 'netvirt-legacy' - - topology: - - 1node: - openstack_system_count: 1 - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - 3node: - openstack_system_count: 1 - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - testplan: '{project}-{topology}-openstack.txt' - - # The project name - functionality: - - upstream - - gate - - stream: - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - openstack: - - newton: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - - newton-nodl-v2: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - odl-ml2-driver-version: 'v2' - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - odl-ml2-driver-version: 'v2' - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - - public-bridge: 'br-ex' diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml deleted file mode 100644 index 48bec1ccc..000000000 --- a/jjb/netvirt/netvirt-legacy-csit.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: netvirt-legacy-csit - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-1node-{functionality}' - - # The project name - project: 'netvirt-legacy' - - # The functionality under test - functionality: 'openstack-basic' - - # Project branches - stream: - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Mininet configuration - tools_system_count: 2 - - # Features to install - install-features: 'odl-ovsdb-openstack' - - # Robot custom options - robot-options: '' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 282b5a0fe..b21a906a3 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -25,10 +25,6 @@ branch: 'stable/carbon' os-branch: 'ocata' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - os-branch: 'newton' - karaf-version: karaf3 jdk: 'openjdk8' @@ -48,28 +44,3 @@ - hwvtep: csit-list: > netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream} - -- project: - name: netvirt-legacy-patch-test - jobs: - - '{project}-patch-test-{feature}-{stream}' - - # The project name - project: 'netvirt-legacy' - - # Project branches - stream: - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - karaf-version: karaf3 - - feature: - - legacy: - csit-list: > - netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream}, - netvirt-legacy-csit-1node-openstack-basic-all-{stream} - - cluster-legacy: - csit-list: > - netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream}, - netvirt-legacy-csit-3node-clustering-only-{stream} diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 2abfff063..9929fc930 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -17,9 +17,6 @@ - carbon: branch: 'stable/carbon' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - karaf-version: karaf3 project: 'netvirt' project-name: 'netvirt' jdk: openjdk8 diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 9c7e833c5..db79a7ff3 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -81,33 +81,6 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' -- project: - name: neutron-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'neutron' - project-name: 'neutron' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - archive-artifacts: '' - - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 58a290911..6e9cb5b3f 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -78,33 +78,6 @@ email-upstream: '[next]' archive-artifacts: '' -- project: - name: next-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'next' - project-name: 'next' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'next-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - archive-artifacts: '' - - project: name: next-sonar jobs: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 3bd2307ab..bb5f81a00 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 318e6ab45..be4ba859a 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -78,33 +78,6 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' -- project: - name: nic-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'nic' - project-name: 'nic' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'nic-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - archive-artifacts: '' - - project: name: nic-sonar jobs: diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index 2863f1159..2b05a0768 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index 484d47e99..1990796c4 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index e5a07d504..f1f38a0ff 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -78,33 +78,6 @@ email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: ocpplugin-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'ocpplugin' - project-name: 'ocpplugin' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: ocpplugin-sonar jobs: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 64c90ad70..d0209dff3 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -97,35 +97,6 @@ javadoc-path: org.opendaylight.$PROJECT/$STREAM staging-profile-id: 880d5ac25eaa -- project: - name: odlparent-boron - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-maven-jobs' - - stream: boron - project: 'odlparent' - project-name: 'odlparent' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[odlparent]' - archive-artifacts: '' - - # Used by the release job - 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 ba2541c9a..62c6444de 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 51b2264d1..c4b9f3c47 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -78,33 +78,6 @@ email-upstream: '[of-config] [netconf]' archive-artifacts: '' -- project: - name: of-config-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'of-config' - project-name: 'of-config' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - archive-artifacts: '' - - project: name: of-config-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index c37c98594..3112d0811 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -74,31 +74,6 @@ email-upstream: '[circuitsw]' archive-artifacts: '' -- project: - name: circuitsw-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/boron' - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - archive-artifacts: '' - - project: name: circuitsw-sonar jobs: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index b98910259..4cb31bcb3 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -52,33 +52,6 @@ email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: openflowjava-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: openflowjava-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index 78397321d..8f4aba0ce 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml index d872626d4..1cb47cd9c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml index 55644fe52..e6258a936 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index 0cc02f670..81f97ad39 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index f9aefb2cb..9a5fea625 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml index dad2261ab..5a98b2514 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 94820c9aa..43def80ed 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 237f0d7fd..1ef98811c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index a1ee79ddf..39396949c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml index c89469899..023f0cc29 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml index 1611e4142..ee39a4369 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index cffae65d4..2b8718fcd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 2a617df4f..5498a6353 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml index 8e972b113..d3a371e33 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 4d47c1f04..c59950c1b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 5259109a9..865b1ca3d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 2f789e50b..2b5e64676 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -19,10 +19,6 @@ branch: 'stable/carbon' os-branch: 'ocata' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - os-branch: 'newton' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index bcde07623..c0e0471e1 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -90,37 +90,6 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' -- project: - name: openflowplugin-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - archive-artifacts: 'model/*/target/site/**' - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index bc59fd09a..7a228a46c 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - boron: - branch: 'stable/boron' - libuv-version: '1.7.5' - rapidjson-version: '1.0.1' - openvswitch-version: 'noiro' project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index 69555d3bb..2d2e0aaf2 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -26,12 +26,6 @@ rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' ovs-scm: v2 - - boron: - branch: 'stable/boron' - libuv-version: '1.7.5' - rapidjson-version: '1.0.1' - openvswitch-version: 'noiro' - ovs-scm: v1 project: 'opflex' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 7dd048e1a..7aba1275a 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -20,11 +20,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - boron: - branch: 'stable/boron' - libuv-version: '1.7.5' - rapidjson-version: '1.0.1' - openvswitch-version: 'origin/noiro' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index acedccb67..7c2c3991c 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index df7fbf19b..df55323ea 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -24,10 +24,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index cffdcd9ca..4b83b0d0b 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -17,12 +17,6 @@ jdks: - openjdk8 karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jdk: openjdk8 - jdks: - - openjdk8 - 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 c2c036467..4958f49f3 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -18,10 +18,6 @@ branch: 'stable/carbon' os-branch: 'ocata' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 51e3eae99..751b21c1e 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -77,30 +77,3 @@ dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' - -- project: - name: ovsdb-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - archive-artifacts: '' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 8c3d9c995..41d81dbfd 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -15,7 +15,6 @@ project: 'integration/packaging' stream: - - boron - carbon - nitrogen - oxygen diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml index 5b84a1fef..07f92bad1 100644 --- a/jjb/packaging/puppet.yaml +++ b/jjb/packaging/puppet.yaml @@ -17,8 +17,6 @@ branch: 'stable/nitrogen' - carbon: branch: 'stable/carbon' - - boron: - branch: 'stable/boron' - job-template: name: '{project-name}-test-sanity-{stream}' diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index eeb615297..660f2104e 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 5e39a9e86..4a3bf9d37 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -78,33 +78,6 @@ email-upstream: '[packetcable]' archive-artifacts: '' -- project: - name: packetcable-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - archive-artifacts: '' - - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 9af91a42c..2afdd2a72 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -78,33 +78,6 @@ email-upstream: '[persistence]' archive-artifacts: '' -- project: - name: persistence-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'persistence' - project-name: 'persistence' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - archive-artifacts: '' - - project: name: persistence-sonar jobs: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index fc1b4f62e..6f37e577e 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -179,8 +179,6 @@ openflowplugin-csit-1node-sanity-only-nitrogen csit-sanity-list-carbon: > openflowplugin-csit-1node-sanity-only-carbon - csit-sanity-list-boron: > - openflowplugin-csit-1node-sanity-only-boron csit-weekly-list-oxygen: > controller-csit-1node-notifications-longevity-only-oxygen, controller-csit-3node-drb-partnheal-longevity-only-oxygen, @@ -210,7 +208,3 @@ distribution-deploy-carbon, distribution-offline-carbon, openflowplugin-csit-1node-periodic-longevity-only-carbon - csit-weekly-list-boron: > - distribution-deploy-boron, - distribution-offline-boron, - openflowplugin-csit-1node-periodic-longevity-only-boron diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 46f5d75a6..af90b04c3 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -75,32 +75,6 @@ email-upstream: '[reservation]' archive-artifacts: '' -- project: - name: reservation-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'reservation' - project-name: 'reservation' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - archive-artifacts: '' - - project: name: reservation-sonar jobs: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 2e17d44f7..48bbb0b0a 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index cd3dd21f2..8d61d315f 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -78,33 +78,6 @@ email-upstream: '[sdninterfaceapp] [bgpcep]' archive-artifacts: '' -- project: - name: sdninterfaceapp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - archive-artifacts: '' - - project: name: sdninterfaceapp-sonar jobs: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 8f9c41f0e..c2b20536a 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index c99296b7d..d8dc40cf3 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -15,8 +15,6 @@ jre: 'openjdk8' - carbon: branch: 'stable/carbon' - - boron: - branch: 'stable/boron' project: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 8d7e86ee3..4c1db60a1 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -78,33 +78,6 @@ email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' archive-artifacts: '' -- project: - name: sfc-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'sfc' - project-name: 'sfc' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' - 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]' - archive-artifacts: '' - - project: name: sfc-sonar jobs: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index f0512522e..826bf95c3 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -78,33 +78,6 @@ email-upstream: '[snbi]' archive-artifacts: '' -- project: - name: snbi-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'snbi' - project-name: 'snbi' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - archive-artifacts: '' - - project: name: snbi-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index ad7354786..170ac0392 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -78,33 +78,6 @@ email-upstream: '[snmp] [odlparent]' archive-artifacts: '' -- project: - name: snmp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'snmp' - project-name: 'snmp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - archive-artifacts: '' - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index b7984cadc..37132955b 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -78,33 +78,6 @@ email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: snmp4sdn-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 2fbba9cb2..47fe89ded 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index eb881946e..1558fd35e 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 0cd47f9e3..aca577a0a 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index cfbb2e49a..1693711d2 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -22,10 +22,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 7c1c0065c..1175fe05c 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -78,33 +78,6 @@ email-upstream: '[sxp] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: sxp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'sxp' - project-name: 'sxp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: sxp-sonar jobs: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index d938c4393..3e6418f88 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index d68579b7c..4dc477ff9 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -78,33 +78,6 @@ email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: topoprocessing-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: topoprocessing-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 282068fc6..29249729d 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index fa4b354ab..cbc43af58 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 86585e6fd..60ab2b38f 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 70637d4f9..f90ec708d 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -78,33 +78,6 @@ email-upstream: '[tsdr]' archive-artifacts: '' -- project: - name: tsdr-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - archive-artifacts: '' - - project: name: tsdr-sonar jobs: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index c86ca2879..c5c0a8981 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -78,33 +78,6 @@ email-upstream: '[ttp] [odlparent]' archive-artifacts: '' -- project: - name: ttp-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'ttp' - project-name: 'ttp' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - archive-artifacts: '' - - project: name: ttp-sonar jobs: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 06723b867..24b9188cc 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index 5ecb7595a..a8f975906 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 92d64761c..60bda6dab 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -78,33 +78,6 @@ email-upstream: '[unimgr] [ovsdb]' archive-artifacts: '' -- project: - name: unimgr-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - archive-artifacts: '' - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 8d5296007..3cd0fd7fd 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index cd97e3314..2ec189879 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc-csit-udp.yaml b/jjb/usc/usc-csit-udp.yaml deleted file mode 100644 index 415f977bb..000000000 --- a/jjb/usc/usc-csit-udp.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: usc-csit-udp - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-1node-{functionality}' - - # The project name - project: 'usc' - - # The functionality under test - functionality: 'udp' - - # Project branches - stream: - - boron: - branch: 'master' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-mdsal-apidocs,odl-usc-channel-ui' - - # Robot custom options - robot-options: '' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 5d97ea784..e5e855657 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -78,33 +78,6 @@ email-upstream: '[usc] [controller] [yangtools] [odlparent]' archive-artifacts: '' -- project: - name: usc-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'usc' - project-name: 'usc' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'usc-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - archive-artifacts: '' - - project: name: usc-sonar jobs: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index afb8d0a46..1740dfab8 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index adc56a605..5afdbd3ee 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -78,33 +78,6 @@ email-upstream: '[usecplugin] [openflowplugin]' archive-artifacts: '' -- project: - name: usecplugin-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - archive-artifacts: '' - - project: name: usecplugin-sonar jobs: diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index cc057faac..122ae874c 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 14921027e..181621249 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -24,11 +24,6 @@ jre: 'openjdk8' karaf-version: karaf3 tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 install: - only: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 5599d9468..59f9284e2 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -23,10 +23,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 install: - all: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 2a68a273d..1aca07d54 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -30,10 +30,6 @@ branch: 'stable/carbon' jre: 'openjdk8' karaf-version: karaf3 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 openstack: - newton: diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index 47376ae7b..1195053c0 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -30,10 +30,3 @@ csit-list: > vtn-csit-1node-manager-all-{stream}, vtn-csit-3node-manager-all-{stream} - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - karaf-version: karaf3 - csit-list: > - vtn-csit-1node-manager-all-{stream}, - vtn-csit-3node-manager-all-{stream} diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index c252dc565..0d2319dd6 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -90,37 +90,6 @@ # https://nexus.opendaylight.org/content/sites/site/ archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' -- project: - name: vtn-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'vtn' - project-name: 'vtn' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - project: name: vtn-sonar jobs: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index df5023ddc..06e6500b7 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -78,33 +78,6 @@ email-upstream: '[yang-push]' archive-artifacts: '' -- project: - name: yang-push-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - archive-artifacts: '' - - project: name: yang-push-sonar jobs: diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 2ea909fd4..832627a47 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -75,32 +75,6 @@ email-upstream: '[yangide] [odlparent] [yangtools]' archive-artifacts: '' -- project: - name: yangide-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'yangide' - project-name: 'yangide' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[yangide] [odlparent] [yangtools]' - archive-artifacts: '' - - project: name: yangide-sonar jobs: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index b2cfdfe87..ea6fd7712 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -79,35 +79,6 @@ email-upstream: '[yangtools] [odlparent]' archive-artifacts: '' -- project: - name: yangtools-boron - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: boron - project: 'yangtools' - project-name: 'yangtools' - branch: 'stable/boron' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn32: - mvn-version: 'mvn32' - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [odlparent]' - archive-artifacts: '' - - project: name: yangtools-sonar jobs: -- 2.36.6