From ddbf3cde9195f2b3635318fed187269504853ab1 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 9 Aug 2018 11:01:29 +0530 Subject: [PATCH] Create Neon jobs and bump fluorine branch Fluorine branch cutting to reflect new stable/fluorine branches and move master to Neon. Change-Id: I6f974db3e07beb94a4f2e3eb7c87495d618d7e0a Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 4 +- jjb/aaa/aaa-csit-keystone.yaml | 4 +- jjb/aaa/aaa-csit-tls.yaml | 4 +- jjb/aaa/aaa-patch-test.yaml | 5 +- jjb/aaa/aaa.yaml | 20 ++++- jjb/alto/alto-csit-setup.yaml | 4 +- jjb/alto/alto.yaml | 20 ++++- jjb/archetypes/archetypes.yaml | 26 +++++- jjb/atrium/atrium.yaml | 19 ++++- jjb/autorelease/autorelease-projects.yaml | 7 +- .../autorelease-version-management.yaml | 4 +- .../validate-autorelease-neon.yaml | 43 ++++++++++ jjb/autorelease/view-autorelease-neon.yaml | 42 ++++++++++ jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 4 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 4 +- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 4 +- .../bgpcep-csit-bgpclustering-longevity.yaml | 4 +- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 4 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 4 +- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 4 +- jjb/bgpcep/bgpcep-patch-test.yaml | 4 +- jjb/bgpcep/bgpcep.yaml | 28 ++++++- jjb/bier/bier-csit-basic.yaml | 4 +- jjb/bier/bier.yaml | 21 ++++- jjb/capwap/capwap-csit-ac.yaml | 4 +- jjb/capwap/capwap.yaml | 19 ++++- jjb/cardinal/cardinal.yaml | 19 ++++- jjb/centinel/centinel-csit-basic.yaml | 4 +- jjb/centinel/centinel.yaml | 19 ++++- jjb/coe/coe-csit.yaml | 4 +- jjb/coe/coe-patch-test.yaml | 4 +- jjb/coe/coe.yaml | 26 +++++- jjb/controller/controller-csit-akka1.yaml | 4 +- .../controller-csit-clustering.yaml | 4 +- .../controller-csit-cs-chasing-leader.yaml | 4 +- .../controller-csit-cs-partnheal.yaml | 4 +- ...ontroller-csit-ddb-expl-lead-movement.yaml | 4 +- .../controller-csit-dnb-noloss.yaml | 4 +- .../controller-csit-drb-partnheal.yaml | 4 +- .../controller-csit-drb-precedence.yaml | 4 +- .../controller-csit-dsbenchmark-cluster.yaml | 4 +- .../controller-csit-dsbenchmark.yaml | 4 +- .../controller-csit-rest-cars-perf.yaml | 4 +- .../controller-csit-rest-clust-cars-perf.yaml | 4 +- jjb/controller/controller-patch-test.yaml | 5 +- jjb/controller/controller.yaml | 24 +++++- jjb/coretutorials/coretutorials.yaml | 20 ++++- jjb/daexim/daexim-csit-basic.yaml | 4 +- jjb/daexim/daexim-csit-clustering-basic.yaml | 4 +- jjb/daexim/daexim.yaml | 20 ++++- jjb/defaults.yaml | 14 ++++ jjb/didm/didm-csit-discovery.yaml | 4 +- jjb/didm/didm.yaml | 19 ++++- jjb/dlux/dlux.yaml | 19 ++++- jjb/dluxapps/dluxapps-csit-yangman.yaml | 4 +- jjb/dluxapps/dluxapps.yaml | 20 ++++- jjb/docs/docs-rtd.yaml | 4 +- jjb/eman/eman.yaml | 21 ++++- jjb/faas/faas.yaml | 19 ++++- jjb/federation/federation.yaml | 20 ++++- jjb/genius/genius-csit-genius.yaml | 4 +- jjb/genius/genius-patch-test.yaml | 5 +- jjb/genius/genius.yaml | 33 +++++++- ...groupbasedpolicy-csit-1node-openstack.yaml | 5 +- .../groupbasedpolicy-csit-3node.yaml | 4 +- .../groupbasedpolicy-csit-6node.yaml | 4 +- .../groupbasedpolicy-csit-clustering.yaml | 4 +- .../groupbasedpolicy-csit-sxp.yaml | 4 +- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 27 +++++- jjb/honeycomb/vbd/vbd.yaml | 19 ++++- jjb/infrautils/infrautils-patch-test.yaml | 5 +- jjb/infrautils/infrautils.yaml | 27 +++++- jjb/integration/csit-jobs-neon.lst | 80 ++++++++++++++++++ .../distribution-csit-userfeatures.yaml | 4 +- .../distribution/distribution-jobs.yaml | 4 +- jjb/integration/integration-test-jobs.yaml | 10 ++- jjb/iotdm/iotdm-csit-basic.yaml | 4 +- jjb/iotdm/iotdm.yaml | 20 ++++- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 4 +- jjb/jsonrpc/jsonrpc.yaml | 19 ++++- .../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 | 24 +++++- jjb/lacp/lacp-csit-lacp.yaml | 4 +- jjb/lacp/lacp.yaml | 19 ++++- .../lispflowmapping-csit-msmr.yaml | 4 +- .../lispflowmapping-csit-performance.yaml | 4 +- jjb/lispflowmapping/lispflowmapping.yaml | 27 +++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 4 +- jjb/mdsal/mdsal-patch-test.yaml | 5 +- jjb/mdsal/mdsal.yaml | 31 ++++++- .../messaging4transport-csit-basic.yaml | 4 +- .../messaging4transport.yaml | 20 ++++- jjb/natapp/natapp.yaml | 20 ++++- jjb/nemo/nemo-csit-engine.yaml | 4 +- jjb/nemo/nemo.yaml | 19 ++++- jjb/netconf/netconf-cluster-stress.yaml | 4 +- jjb/netconf/netconf-clustering-scale.yaml | 4 +- jjb/netconf/netconf-clustering.yaml | 4 +- jjb/netconf/netconf-csit-callhome.yaml | 4 +- jjb/netconf/netconf-patch-test.yaml | 5 +- jjb/netconf/netconf-scale.yaml | 4 +- jjb/netconf/netconf-userfeatures.yaml | 4 +- jjb/netconf/netconf.yaml | 23 +++++- jjb/netide/netide-csit-basic.yaml | 4 +- jjb/netide/netide.yaml | 19 ++++- .../netvirt-csit-hwvtep-openstack.yaml | 56 +++++++++++++ jjb/netvirt/netvirt-csit-multi-openstack.yaml | 82 +++++++++++++++++++ jjb/netvirt/netvirt-full-integration.yaml | 4 +- jjb/netvirt/netvirt-patch-test.yaml | 5 +- jjb/netvirt/netvirt.yaml | 4 +- jjb/neutron/neutron-patch-test.yaml | 5 +- jjb/neutron/neutron.yaml | 22 ++++- jjb/next/next.yaml | 19 ++++- jjb/nic/nic.yaml | 20 ++++- jjb/ocpplugin/ocpplugin.yaml | 19 ++++- jjb/odlparent/odlparent-patch-test.yaml | 5 +- jjb/odltools/odltools.yaml | 4 +- jjb/of-config/of-config-csit-basic.yaml | 4 +- jjb/of-config/of-config.yaml | 19 ++++- jjb/ofextensions/circuitsw/circuitsw.yaml | 19 ++++- ...ugin-csit-bundle-based-reconciliation.yaml | 4 +- .../openflowplugin-csit-cbench.yaml | 4 +- ...flowplugin-csit-clustering-bulkomatic.yaml | 4 +- ...lugin-csit-clustering-perf-bulkomatic.yaml | 4 +- .../openflowplugin-csit-clustering.yaml | 4 +- .../openflowplugin-csit-flow-services.yaml | 4 +- .../openflowplugin-csit-longevity.yaml | 4 +- .../openflowplugin-csit-perf-bulkomatic.yaml | 4 +- ...flowplugin-csit-perf-stats-collection.yaml | 4 +- .../openflowplugin-csit-sanity.yaml | 4 +- .../openflowplugin-csit-scale-link.yaml | 4 +- .../openflowplugin-csit-scale-switch.yaml | 4 +- .../openflowplugin-csit-scale.yaml | 4 +- .../openflowplugin-patch-test.yaml | 5 +- jjb/openflowplugin/openflowplugin.yaml | 34 +++++++- jjb/opflex/opflex-custom.yaml | 7 +- jjb/opflex/opflex.yaml | 7 +- jjb/ovil/ovil.yaml | 21 ++++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 +- jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 +- jjb/ovsdb/ovsdb-full-integration.yaml | 4 +- jjb/ovsdb/ovsdb-patch-test.yaml | 5 +- jjb/ovsdb/ovsdb.yaml | 27 +++++- jjb/p4plugin/p4plugin-csit-basic.yaml | 4 +- jjb/p4plugin/p4plugin.yaml | 20 ++++- jjb/packaging/packaging.yaml | 1 + jjb/packetcable/packetcable-csit-pcmm.yaml | 4 +- jjb/packetcable/packetcable.yaml | 19 ++++- jjb/persistence/persistence.yaml | 20 ++++- jjb/reservation/reservation.yaml | 19 ++++- .../sdninterfaceapp-csit-basic.yaml | 4 +- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 20 ++++- jjb/serviceutils/serviceutils-patch-test.yaml | 5 +- jjb/serviceutils/serviceutils.yaml | 4 +- jjb/sfc/sfc-csit-full-deploy.yaml | 4 +- jjb/sfc/sfc-csit-rest-basic.yaml | 4 +- jjb/sfc/sfc-patch-test.yaml | 5 +- jjb/sfc/sfc-python.yaml | 4 +- jjb/sfc/sfc.yaml | 27 +++++- jjb/snbi/snbi.yaml | 19 ++++- jjb/snmp/snmp.yaml | 19 ++++- jjb/snmp4sdn/snmp4sdn.yaml | 19 ++++- jjb/sxp/sxp-csit-basic.yaml | 4 +- jjb/sxp/sxp-csit-binding-origin.yaml | 4 +- jjb/sxp/sxp-csit-cluster-routing.yaml | 4 +- jjb/sxp/sxp-csit-clustering.yaml | 4 +- jjb/sxp/sxp-csit-filtering.yaml | 4 +- jjb/sxp/sxp-csit-performance.yaml | 4 +- jjb/sxp/sxp-csit-topology.yaml | 4 +- jjb/sxp/sxp.yaml | 19 ++++- jjb/systemmetrics/systemmetrics.yaml | 19 ++++- jjb/telemetry/telemetry.yaml | 27 +++++- jjb/topoprocessing/topoprocessing.yaml | 19 ++++- jjb/transportpce/transportpce.yaml | 19 ++++- jjb/tsdr/tsdr-csit-cassandra.yaml | 4 +- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 4 +- jjb/tsdr/tsdr-csit-hbase.yaml | 4 +- jjb/tsdr/tsdr-csit-hsqldb.yaml | 4 +- jjb/tsdr/tsdr.yaml | 19 ++++- jjb/ttp/ttp.yaml | 19 ++++- jjb/unimgr/unimgr.yaml | 20 ++++- jjb/usc/usc-csit-channel.yaml | 4 +- jjb/usc/usc-csit-tcp.yaml | 4 +- jjb/usc/usc.yaml | 20 ++++- jjb/usecplugin/usecplugin-csit-basic.yaml | 4 +- jjb/usecplugin/usecplugin.yaml | 19 ++++- jjb/yang-push/yang-push.yaml | 19 ++++- jjb/yangide/yangide.yaml | 19 ++++- jjb/yangtools/yangtools-csit-system.yaml | 4 +- jjb/yangtools/yangtools-patch-test.yaml | 5 +- 193 files changed, 2016 insertions(+), 186 deletions(-) create mode 100644 jjb/autorelease/validate-autorelease-neon.yaml create mode 100644 jjb/autorelease/view-autorelease-neon.yaml create mode 100644 jjb/integration/csit-jobs-neon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 36bdb6040..8d328842c 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index b50de45b9..614ef0465 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 2936489df..9afe09314 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 15dfe5b32..435bbf8cf 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: 'aaa' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 10bcf3604..98d4f58fa 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,22 @@ --- +- project: + name: aaa-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: neon + project: 'aaa' + project-name: 'aaa' + branch: 'master' + mvn-settings: 'aaa-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[aaa] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 9318cf3c82c33 + - project: name: aaa-fluorine jobs: @@ -8,7 +26,7 @@ stream: fluorine project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'aaa-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index c0c1c0434..ef5c322ac 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 52ace6034..2c06d8482 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,4 +1,22 @@ --- +- project: + name: alto-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'alto' + project-name: 'alto' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'alto-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'l2switch-merge-{stream}' + email-upstream: '[alto] [l2switch]' + + # Used by the release job + staging-profile-id: 931eabae9693c + - project: name: alto-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'alto' project-name: 'alto' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 111686ce4..99518b74b 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,28 @@ --- +- project: + name: archetypes-neon + jobs: + - gerrit-maven-clm + - '{project-name}-merge-{stream}': + build-timeout: 180 + cron: '@daily' + mvn-goals: clean install -V -Dmaven.compile.fork=true + - gerrit-maven-release + - gerrit-maven-verify + - gerrit-maven-verify-dependencies: + build-timeout: 180 + + stream: neon + project: 'archetypes' + project-name: 'archetypes' + branch: 'master' + mvn-settings: 'archetypes-settings' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' + email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: d88dcfe6ce48d + - project: name: archetypes-fluorine jobs: @@ -15,7 +39,7 @@ stream: fluorine project: 'archetypes' project-name: 'archetypes' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'archetypes-settings' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index be3daede0..9f7e262b9 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -1,4 +1,21 @@ --- +- project: + name: atrium-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'atrium' + project-name: 'atrium' + branch: 'master' + mvn-settings: 'atrium-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[atrium]' + + # Used by the release job + staging-profile-id: 9324f12310e6a + - project: name: atrium-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'atrium' project-name: 'atrium' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'atrium-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 79d679cc1..3be151352 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -13,8 +13,13 @@ - gerrit-tox-verify stream: - - fluorine: + - neon: branch: 'master' + integration-test: neon + extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g + -Dskip.karaf.featureTest=true + - fluorine: + branch: 'stable/fluorine' integration-test: fluorine extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g -Dskip.karaf.featureTest=true diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 5c5df61e9..20b96a434 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -11,7 +11,9 @@ build-node: centos7-builder-2c-8g stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/autorelease/validate-autorelease-neon.yaml b/jjb/autorelease/validate-autorelease-neon.yaml new file mode 100644 index 000000000..43cd3e209 --- /dev/null +++ b/jjb/autorelease/validate-autorelease-neon.yaml @@ -0,0 +1,43 @@ +--- +# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job +- project: + name: autorelease-validate-neon + jobs: + - '{project-name}-validate-autorelease-{stream}' + stream: neon + branch: master + project-name: + - aaa: + project: aaa + - bgpcep: + project: bgpcep + - controller: + project: controller + - coe: + project: coe + - daexim: + project: daexim + - genius: + project: genius + - infrautils: + project: infrautils + - integration-distribution: + project: integration/distribution + - lispflowmapping: + project: lispflowmapping + - mdsal: + project: mdsal + - netconf: + project: netconf + - netvirt: + project: netvirt + - neutron: + project: neutron + - openflowplugin: + project: openflowplugin + - ovsdb: + project: ovsdb + - serviceutils: + project: serviceutils + - sfc: + project: sfc diff --git a/jjb/autorelease/view-autorelease-neon.yaml b/jjb/autorelease/view-autorelease-neon.yaml new file mode 100644 index 000000000..166df41b5 --- /dev/null +++ b/jjb/autorelease/view-autorelease-neon.yaml @@ -0,0 +1,42 @@ +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_neon + name: releng-view-autorelease-neon + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-neon + description: 'List of neon Merge jobs for Autorelease' + job-name: + - 'aaa-maven-merge-neon' + - 'bgpcep-maven-merge-neon' + - 'controller-maven-merge-neon' + - 'coe-maven-merge-neon' + - 'daexim-maven-merge-neon' + - 'genius-maven-merge-neon' + - 'infrautils-maven-merge-neon' + - 'integration/distribution-maven-merge-neon' + - 'lispflowmapping-maven-merge-neon' + - 'mdsal-maven-merge-neon' + - 'netconf-maven-merge-neon' + - 'netvirt-maven-merge-neon' + - 'neutron-maven-merge-neon' + - 'openflowplugin-maven-merge-neon' + - 'ovsdb-maven-merge-neon' + - 'serviceutils-maven-merge-neon' + - 'sfc-maven-merge-neon' + <<: *releng_autorelease_view_common_neon diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 846e07ad0..7347ea018 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index ca9fa8ce9..31794be64 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 248aeec6e..b6f0ca61d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 4c19390a4..84e5bb2a6 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index dd72b0f53..c8902b46b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 986e53e29..534b08f25 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 98542632c..40e58d612 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index f1e2b7a4a..2405fe4bd 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 11f560f5b..fb8ebd152 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,30 @@ --- +- project: + name: bgpcep-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'bgpcep' + project-name: 'bgpcep' + build-node: centos7-builder-8c-8g + build-timeout: 120 + branch: 'master' + mvn-settings: 'bgpcep-settings' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream}, + tcpmd5-merge-{stream} + email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' + + # Used by the release job + staging-profile-id: 9427a05049030 + - project: name: bgpcep-fluorine jobs: @@ -11,7 +37,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'bgpcep-settings' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 67dcb5c01..dc3860669 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 943205bdf..953bfee2d 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,4 +1,23 @@ --- +- project: + name: bier-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'bier' + project-name: 'bier' + branch: 'master' + build-node: centos7-builder-2c-8g + build-timeout: 90 + mvn-settings: 'bier-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[bier]' + + # Used by the release job + staging-profile-id: 942a8075b1f2a + - project: name: bier-fluorine jobs: @@ -7,7 +26,7 @@ stream: fluorine project: 'bier' project-name: 'bier' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 1ed2c5d6c..1e2c783a5 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 95c26f504..3ecfeb5f1 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -1,4 +1,21 @@ --- +- project: + name: capwap-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'capwap' + project-name: 'capwap' + branch: 'master' + mvn-settings: 'capwap-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[capwap]' + + # Used by the release job + staging-profile-id: 96bd6b5bf86e3 + - project: name: capwap-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'capwap' project-name: 'capwap' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'capwap-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index ba42c4da8..e13cf73b3 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -1,4 +1,21 @@ --- +- project: + name: cardinal-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'cardinal' + project-name: 'cardinal' + branch: 'master' + mvn-settings: 'cardinal-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' + email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' + + # Used by the release job + staging-profile-id: 96be20348f0f2 + - project: name: cardinal-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'cardinal' project-name: 'cardinal' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'cardinal-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 47ba93e77..71988d3ae 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index efc2054ff..ac2a045fb 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -1,4 +1,21 @@ --- +- project: + name: centinel-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'centinel' + project-name: 'centinel' + branch: 'master' + mvn-settings: 'centinel-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[centinel]' + + # Used by the release job + staging-profile-id: 96bf9b3fefd8a + - project: name: centinel-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'centinel' project-name: 'centinel' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'centinel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml index 9af24570a..1b0722bd9 100644 --- a/jjb/coe/coe-csit.yaml +++ b/jjb/coe/coe-csit.yaml @@ -10,8 +10,10 @@ install-features: 'odl-netvirt-coe' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml index e838bbab6..e79ddf59b 100644 --- a/jjb/coe/coe-patch-test.yaml +++ b/jjb/coe/coe-patch-test.yaml @@ -7,8 +7,10 @@ project: 'coe' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 5c0a5f5db..e18132ae8 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,28 @@ --- +- project: + name: coe-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: coe + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ + rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 + - odl-maven-jobs + + project: 'coe' + project-name: 'coe' + stream: neon + branch: 'master' + mvn-settings: 'coe-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[coe] [odlparent] [yangtools] [controller]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: 96c0be46aac33 + - project: name: coe-fluorine jobs: @@ -13,7 +37,7 @@ project: 'coe' project-name: 'coe' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'coe-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index e3488469e..2b655baa6 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,8 +11,10 @@ functionality: 'akka1' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 36beac121..d65db362b 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -9,8 +9,10 @@ functionality: 'clustering' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index b8cc17ed8..7397512ac 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 14b1725da..db10859a7 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 33c84f632..250ce7da1 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index f0b6362b9..0aefef94d 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 8cad5fe09..1239d74f6 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 742d2b90f..6f95f90c4 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 472c2fa75..9f14470e8 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 3c8973cb1..b54e60c4a 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 82196035c..a631e6282 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 0c8043371..a1546a218 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index ef786c01c..3eadc236e 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: 'controller' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index c6b7b4c13..3d9a339fe 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,26 @@ --- +- project: + name: controller-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'controller' + project-name: 'controller' + branch: 'master' + mvn-settings: 'controller-settings' + mvn-goals: 'clean deploy -Pintegrationtests,docs' + mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-node: centos7-builder-8c-8g + build-timeout: 90 + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' + email-upstream: '[controller] [odlparent] [yangtools] [aaa]' + + # Used by the release job + staging-profile-id: 96c1c9177efdd + - project: name: controller-fluorine jobs: @@ -9,7 +31,7 @@ stream: fluorine project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 824580b2c..c62b1b407 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -1,4 +1,22 @@ --- +- project: + name: coretutorials-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'coretutorials' + project-name: 'coretutorials' + branch: 'master' + mvn-settings: 'coretutorials-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[coretutorials]' + build-timeout: 120 + + # Used by the release job + staging-profile-id: 96cd299563ec6 + - project: name: coretutorials-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'coretutorials' project-name: 'coretutorials' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'coretutorials-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 1324d4df2..731844dea 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index b34bcd5c4..bf041892c 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index af0cb1559..027cadcd8 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,22 @@ --- +- project: + name: daexim-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + project: 'daexim' + project-name: 'daexim' + stream: neon + branch: 'master' + mvn-settings: 'daexim-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[daexim] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96e4dade34bd7 + - project: name: daexim-fluorine jobs: @@ -8,7 +26,7 @@ project: 'daexim' project-name: 'daexim' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index d63f8986b..7c4b4f9a9 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -200,16 +200,30 @@ 10-exclude-value: '' # Manual CSIT job lists used by sanity or periodic in nature. + csit-high-frequency-list-neon: > + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon csit-high-frequency-list-fluorine: > netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine csit-high-frequency-list-oxygen: > netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen + csit-sanity-list-neon: > + openflowplugin-csit-1node-sanity-only-neon, + distribution-sanity-neon csit-sanity-list-fluorine: > openflowplugin-csit-1node-sanity-only-fluorine, distribution-sanity-fluorine csit-sanity-list-oxygen: > openflowplugin-csit-1node-sanity-only-oxygen, distribution-sanity-oxygen + csit-weekly-list-neon: > + controller-csit-1node-notifications-longevity-only-neon, + controller-csit-3node-drb-partnheal-longevity-only-neon, + controller-csit-3node-drb-precedence-longevity-only-neon, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon, + bgpcep-csit-3node-bgpclustering-longevity-only-neon, + distribution-deploy-neon, + distribution-offline-neon, + openflowplugin-csit-1node-longevity-only-neon csit-weekly-list-fluorine: > controller-csit-1node-notifications-longevity-only-fluorine, controller-csit-3node-drb-partnheal-longevity-only-fluorine, diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index b1e4b2014..2c630ac72 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index b7a6e8704..11a7b2cd0 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -1,4 +1,21 @@ --- +- project: + name: didm-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'didm' + project-name: 'didm' + branch: 'master' + mvn-settings: 'didm-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[didm]' + + # Used by the release job + staging-profile-id: 96e6338c870f5 + - project: name: didm-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'didm' project-name: 'didm' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'didm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 5cf48822e..4308da7d4 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -1,4 +1,21 @@ --- +- project: + name: dlux-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'dlux' + project-name: 'dlux' + branch: 'master' + mvn-settings: 'dlux-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[dlux] [odlparent]' + + # Used by the release job + staging-profile-id: 96e6a0327484f + - project: name: dlux-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'dlux' project-name: 'dlux' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'dlux-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 46f7ae503..65f5c6f85 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index d006b1540..85aefe9de 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,22 @@ --- +- project: + name: dluxapps-neon + jobs: + - odl-maven-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: neon + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'dluxapps-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96e6fb1e65bf9 + - project: name: dluxapps-fluorine jobs: @@ -7,7 +25,7 @@ project: 'dluxapps' project-name: 'dluxapps' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index a3a9bea5b..7ce8b8cc3 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 82b6c628a..919c4719b 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -1,4 +1,23 @@ --- +- project: + name: eman-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'eman' + project-name: 'eman' + branch: 'master' + mvn-settings: 'eman-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[eman]' + build-node: centos7-builder-4c-16g + + # Used by the release job + staging-profile-id: 96e9352979521 + - project: name: eman-fluorine jobs: @@ -8,7 +27,7 @@ stream: fluorine project: 'eman' project-name: 'eman' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'eman-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 9c6292c5a..bf762128a 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -1,4 +1,21 @@ --- +- project: + name: faas-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'faas' + project-name: 'faas' + branch: 'master' + mvn-settings: 'faas-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[faas]' + + # Used by the release job + staging-profile-id: 96f5ac591d858 + - project: name: faas-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'faas' project-name: 'faas' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'faas-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 1cb290d76..114719cb3 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -1,4 +1,22 @@ --- +- project: + name: federation-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + project: 'federation' + project-name: 'federation' + stream: neon + branch: 'master' + mvn-settings: 'federation-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[federation] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: 96f78c7a40a24 + - project: name: federation-fluorine jobs: @@ -8,7 +26,7 @@ project: 'federation' project-name: 'federation' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'federation-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 056e8a3c1..98dd8fafb 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -14,8 +14,10 @@ testplan: '{project}-tdd-wip.txt' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 354b44152..6b400ad86 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,9 +7,12 @@ project: 'genius' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index ba9fcf5fe..6461944d3 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,35 @@ --- +- project: + name: genius-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f + - odl-maven-jobs + + stream: neon + project: 'genius' + project-name: 'genius' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'genius-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + build-timeout: 90 + dependencies: > + controller-merge-{stream}, + yangtools-merge-{stream}, + odlparent-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream} + email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' + + # Used by the release job + staging-profile-id: 96fb4b6d9d1ee + - project: name: genius-fluorine jobs: @@ -14,7 +45,7 @@ stream: fluorine project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 57d8b73a6..6b33561b9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -19,9 +19,12 @@ functionality: 'openstack' stream: - - fluorine: + - neon: branch: 'master' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - fluorine: + branch: 'stable/fluorine' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - oxygen: branch: 'stable/oxygen' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 4a3b08f98..5589adb53 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 4397cb80f..5779e1a1d 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 6395c4052..10dbc33ad 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 3fa1a99c5..6a826d474 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index aff6ca8da..607b26b73 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,29 @@ --- +- project: + name: groupbasedpolicy-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'groupbasedpolicy' + project-name: 'groupbasedpolicy' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'groupbasedpolicy-settings' + mvn-goals: '-U clean deploy findbugs:findbugs' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + build-timeout: 90 + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} + email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' + + # Used by the release job + staging-profile-id: 96fbb93f95a76 + - project: name: groupbasedpolicy-fluorine jobs: @@ -7,7 +32,7 @@ stream: fluorine project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index ef481385f..ff6d95171 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,4 +1,21 @@ --- +- project: + name: vbd-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'honeycomb/vbd' + project-name: 'vbd' + branch: 'master' + mvn-settings: 'honeycomb-vbd-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[vbd]' + + # Used by the release job + staging-profile-id: 96fc362c36862 + - project: name: vbd-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'honeycomb/vbd' project-name: 'vbd' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'honeycomb-vbd-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 687f3b5d6..0ad48be4e 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'infrautils' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index dc6294200..6ccd941b0 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,29 @@ --- +- project: + name: infrautils-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: infrautils + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ + rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 + - odl-maven-jobs + + stream: neon + project: 'infrautils' + project-name: 'infrautils' + branch: 'master' + mvn-settings: 'infrautils-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[infrautils] [odlparent]' + + # Used by the release job + staging-profile-id: 96fca0367756c + - project: name: infrautils-fluorine jobs: @@ -15,7 +40,7 @@ stream: fluorine project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst new file mode 100644 index 000000000..e88d28cd8 --- /dev/null +++ b/jjb/integration/csit-jobs-neon.lst @@ -0,0 +1,80 @@ +aaa-csit-1node-authn-all-neon, +aaa-csit-1node-keystone-all-neon, +aaa-csit-1node-tls-only-neon, +bgpcep-csit-1node-bgp-ingest-all-neon, +bgpcep-csit-1node-bgp-ingest-mixed-all-neon, +bgpcep-csit-1node-throughpcep-all-neon, +bgpcep-csit-1node-userfeatures-all-neon, +bgpcep-csit-3node-bgpclustering-all-neon, +bgpcep-csit-3node-bgpclustering-ha-only-neon, +coe-csit-1node-container-networking-all-neon, +controller-csit-1node-akka1-all-neon, +controller-csit-1node-benchmark-all-neon, +controller-csit-1node-rest-cars-perf-all-neon, +controller-csit-3node-benchmark-all-neon, +controller-csit-3node-clustering-all-neon, +controller-csit-3node-rest-clust-cars-perf-ask-only-neon, +controller-csit-3node-rest-clust-cars-perf-tell-only-neon, +daexim-csit-1node-basic-only-neon, +daexim-csit-3node-clustering-basic-only-neon, +distribution-csit-1node-userfeatures-all-neon, +distribution-csit-managed-neon, +genius-csit-1node-upstream-all-neon, +genius-csit-3node-upstream-all-neon, +lispflowmapping-csit-1node-msmr-all-neon, +lispflowmapping-csit-1node-performance-only-neon, +lispflowmapping-csit-3node-msmr-all-neon, +mdsal-csit-1node-bindingv1-only-neon, +netconf-csit-1node-callhome-only-neon, +netconf-csit-1node-scale-all-neon, +netconf-csit-1node-userfeatures-all-neon, +netconf-csit-3node-cluster-stress-all-neon, +netconf-csit-3node-clustering-all-neon, +netconf-csit-3node-clustering-scale-all-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-snat-conntrack-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-snat-conntrack-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon, +netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-neon, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon, +openflowplugin-csit-1node-bundle-based-reconciliation-all-neon, +openflowplugin-csit-1node-cbench-only-neon, +openflowplugin-csit-1node-flow-services-all-neon, +openflowplugin-csit-1node-perf-bulkomatic-only-neon, +openflowplugin-csit-1node-perf-stats-collection-only-neon, +openflowplugin-csit-1node-scale-link-only-neon, +openflowplugin-csit-1node-scale-only-neon, +openflowplugin-csit-1node-scale-switch-only-neon, +openflowplugin-csit-3node-clustering-bulkomatic-only-neon, +openflowplugin-csit-3node-clustering-only-neon, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-neon, +ovsdb-csit-1node-upstream-southbound-all-neon, +ovsdb-csit-3node-upstream-clustering-only-neon, +sfc-csit-3node-docker-full-deploy-all-neon, +sfc-csit-3node-rest-basic-all-neon, +yangtools-csit-1node-system-only-neon, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 4c69b386c..1381e246b 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 1792c171f..bd2d1652a 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -19,8 +19,10 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' email-upstream: '[int/dist]' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' karaf-version: odl # Self-Managed projects repos and features: sm-repos: > diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index da4fb8f3d..18e614c44 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -17,9 +17,17 @@ # CSIT Lists in defaults.yaml stream: - - fluorine: + - neon: branch: 'master' mvn-version: 'mvn35' + csit-list: !include: csit-jobs-neon.lst + build-order: > + odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep + ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt + + - fluorine: + branch: 'stable/fluorine' + mvn-version: 'mvn35' csit-list: !include: csit-jobs-fluorine.lst build-order: > odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index faac19f1e..df7ec1e49 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 0d903164e..6a2589070 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -1,4 +1,22 @@ --- +- project: + name: iotdm-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'iotdm' + project-name: 'iotdm' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'iotdm-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'aaa-merge-{stream}' + email-upstream: '[iotdm] [aaa]' + + # Used by the release job + staging-profile-id: 96fd6e9453970 + - project: name: iotdm-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'iotdm' project-name: 'iotdm' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'iotdm-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 49f1336b6..c6a0cb8fe 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 109d7e919..400b6d7f3 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,21 @@ --- +- project: + name: jsonrpc-neon + jobs: + - odl-maven-jobs + + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: neon + branch: 'master' + mvn-settings: 'jsonrpc-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' + email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: 96fdf4408765d + - project: name: jsonrpc-fluorine jobs: @@ -7,7 +24,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'jsonrpc-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 5b7bd6afc..332eddb34 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 615aee50e..2366e31e0 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 52756aa82..3c7fd0e81 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index d579e9f51..8634fd449 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -9,8 +9,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 57205f112..4f14ebcbd 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,26 @@ --- +- project: + name: l2switch-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'l2switch' + project-name: 'l2switch' + branch: 'master' + mvn-settings: 'l2switch-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} + email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' + + # Used by the release job + staging-profile-id: 96fee85953ca0 + - project: name: l2switch-fluorine jobs: @@ -7,7 +29,7 @@ stream: fluorine project: 'l2switch' project-name: 'l2switch' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'l2switch-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index a1ba81b94..b83a89480 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index aa257c0ff..4a81fba6d 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: lacp-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'lacp' + project-name: 'lacp' + branch: 'master' + mvn-settings: 'lacp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' + email-upstream: '[lacp] [openflowjava] [openflowplugin]' + + # Used by the release job + staging-profile-id: 96ff6c0ff6ab1 + - project: name: lacp-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'lacp' project-name: 'lacp' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'lacp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 3ed9a6506..a08c79e5a 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 85662fa09..9017bc067 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index a927ee0b8..1a194688e 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,29 @@ --- +- project: + name: lispflowmapping-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'lispflowmapping' + project-name: 'lispflowmapping' + branch: 'master' + mvn-settings: 'lispflowmapping-settings' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' + email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' + archive-artifacts: > + **/*.log + **/target/surefire-reports/*-output.txt + + build-node: centos7-builder-8c-8g + + # Used by the release job + staging-profile-id: 96fff2503b766 + - project: name: lispflowmapping-fluorine jobs: @@ -9,7 +34,7 @@ stream: fluorine project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 70cebc427..b29c3ce7d 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -11,8 +11,10 @@ functionality: 'bindingv1' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 63c64c816..978010b2d 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: 'mdsal' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 8eec4af44..93e9a24a5 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -1,4 +1,33 @@ --- +- project: + name: mdsal-neon + jobs: + - '{project-name}-distribution-check-{stream}': + mvn-version: 'mvn35' + - '{project-name}-maven-javadoc-jobs': + mvn-version: 'mvn33' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: mdsal + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/ + rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002 + - odl-maven-jobs + + stream: neon + project: 'mdsal' + project-name: 'mdsal' + branch: 'master' + mvn-settings: 'mdsal-settings' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' + build-node: centos7-builder-8c-8g + build-timeout: 90 + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[mdsal] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-fluorine jobs: @@ -16,7 +45,7 @@ stream: fluorine project: 'mdsal' project-name: 'mdsal' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index 3c620626f..91ae65621 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 484a0368f..c49cc48a4 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -1,4 +1,22 @@ --- +- project: + name: messaging4transport-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'messaging4transport' + project-name: 'messaging4transport' + branch: 'master' + mvn-settings: 'messaging4transport-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[messaging4transport]' + + # Used by the release job + staging-profile-id: a677283157db4 + - project: name: messaging4transport-fluorine jobs: @@ -8,7 +26,7 @@ stream: fluorine project: 'messaging4transport' project-name: 'messaging4transport' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'messaging4transport-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index c37bcce61..84ceac995 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: natapp-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'natapp' + project-name: 'natapp' + branch: 'master' + mvn-settings: 'natapp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream}' + email-upstream: '[natapp] [openflowplugin]' + + # Used by the release job + staging-profile-id: a679c0f4f08a8 + - project: name: natapp-fluorine jobs: @@ -8,7 +26,7 @@ stream: fluorine project: 'natapp' project-name: 'natapp' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'natapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index e856c23bc..d56aeb22e 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 890cdea8f..531c603dc 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,21 @@ --- +- project: + name: nemo-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'nemo' + project-name: 'nemo' + branch: 'master' + mvn-settings: 'nemo-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[nemo]' + + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'nemo' project-name: 'nemo' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'nemo-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index e107549d2..c2dbc5320 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 35393c283..18da27dc5 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 0deef710b..1aa626f0a 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index f7691ee3a..7e85868e0 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 21073fdd8..97cd96f91 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netconf' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 7c63b90f2..2c01fffe2 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index bd81d2c49..fdbd77aaa 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 54d9cbd21..5a7af6fd1 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,25 @@ --- +- project: + name: netconf-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - odl-maven-jobs + + stream: neon + project: 'netconf' + project-name: 'netconf' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'netconf-settings' + mvn-goals: 'clean deploy -Pintegrationtests' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-timeout: 90 + dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-fluorine jobs: @@ -8,7 +29,7 @@ stream: fluorine project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 7677a6596..c640bdbc0 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 24439555d..44281fe5f 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -1,4 +1,21 @@ --- +- project: + name: netide-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'netide' + project-name: 'netide' + branch: 'master' + mvn-settings: 'netide-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowjava-merge-{stream}' + email-upstream: '[netide] [openflowjava]' + + # Used by the release job + staging-profile-id: a67bab3755815 + - project: name: netide-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'netide' project-name: 'netide' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'netide-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index de4afa6d0..076d1fcee 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,4 +1,60 @@ --- +- project: + name: netvirt-csit-hwvtep-openstack-integration-neon + jobs: + - inttest-csit-hwvtep-openstack + + project: 'netvirt' + stream: 'neon' + branch: 'master' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-8 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + - 3node: + openstack_system2_count: 2 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + + functionality: + - upstream-stateful + - gate-stateful + + openstack: + - pike: + openstack-branch: 'stable/pike' + odl-ml2-branch: 'stable/pike' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - queens: + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_queens}' + openstack_system2_image: '{openstack_system_image_queens}' + - project: name: netvirt-csit-hwvtep-openstack-integration-fluorine jobs: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index f7cc8ff7f..cb274a37a 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -1,4 +1,86 @@ --- +- project: + name: netvirt-csit-openstack-integration-neon + jobs: + - inttest-csit-openstack + + project: 'netvirt' + stream: 'neon' + branch: 'master' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,tempest' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-8 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + + functionality: + - upstream-stateful + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: + - pike: + openstack-branch: 'stable/pike' + odl-ml2-branch: 'stable/pike' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' + enable-openstack-network-services: '{openstack_legacy_default_network_services}' + - queens: + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_system_image_queens}' + openstack_system2_image: '{openstack_system_image_queens}' + - project: name: netvirt-csit-openstack-integration-fluorine jobs: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 9b8698c7a..c43df198c 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -5,8 +5,10 @@ - 'netvirt-daily-full-integration-{stream}' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 3c7d11311..a4cc53671 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netvirt' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 2a3d122ea..9d86adb62 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -14,8 +14,10 @@ - odl-maven-jobs stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index bc4362798..1e3307096 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,9 +7,12 @@ project: 'neutron' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index de720cc6e..f4f348edc 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,24 @@ --- +- project: + name: neutron-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'neutron' + project-name: 'neutron' + build-timeout: 90 + branch: 'master' + mvn-settings: 'neutron-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' + email-upstream: '[neutron] [odlparent] [aaa]' + + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-fluorine jobs: @@ -10,7 +30,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 42771d028..2a29e6dcd 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -1,4 +1,21 @@ --- +- project: + name: next-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'next' + project-name: 'next' + branch: 'master' + mvn-settings: 'next-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[next]' + + # Used by the release job + staging-profile-id: a67e7c516f385 + - project: name: next-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'next' project-name: 'next' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'next-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index c11083876..77176cfab 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -1,4 +1,22 @@ --- +- project: + name: nic-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'nic' + project-name: 'nic' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'nic-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' + email-upstream: '[nic] [vtn] [groupbasedpolicy]' + + # Used by the release job + staging-profile-id: a67ef386204aa + - project: name: nic-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'nic' project-name: 'nic' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'nic-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 5f3c2313c..36dc2f892 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -1,4 +1,21 @@ --- +- project: + name: ocpplugin-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'ocpplugin' + project-name: 'ocpplugin' + branch: 'master' + mvn-settings: 'ocpplugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a687673279f9c + - project: name: ocpplugin-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'ocpplugin' project-name: 'ocpplugin' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'ocpplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 792b36914..91a38b492 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,9 +7,12 @@ project: 'odlparent' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 58b3797b9..0b02c164e 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -11,8 +11,10 @@ rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2 stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' project: odltools project-name: odltools diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 5af388393..a9beb7816 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 322f2a585..37f2475a8 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,21 @@ --- +- project: + name: of-config-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'of-config' + project-name: 'of-config' + branch: 'master' + mvn-settings: 'of-config-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: netconf-merge-{stream}' + email-upstream: '[of-config] [netconf]' + + # Used by the release job + staging-profile-id: a6880455efe67 + - project: name: of-config-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'of-config' project-name: 'of-config' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'of-config-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index bd0d28804..d6cb6682a 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -1,4 +1,21 @@ --- +- project: + name: circuitsw-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'ofextensions/circuitsw' + project-name: 'circuitsw' + branch: 'master' + mvn-settings: 'ofextensions-circuitsw-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[circuitsw]' + + # Used by the release job + staging-profile-id: a68970cf5b25c + - project: name: circuitsw-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'ofextensions/circuitsw' project-name: 'circuitsw' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'ofextensions-circuitsw-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 1d204fb82..1c7036ce4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -10,8 +10,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 5e518c127..9b4005226 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 8dcbbc35d..70e26fbe7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index a1c65c659..5d294a6d9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index de884107d..0f3bba85e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 7b6f51859..fe51f8766 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 5a43439c1..0f0ac4c1f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index a5e190ec9..98f5e083e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index cb43fc97b..6c60ea5c1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 66165551b..85045f4d5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index c85c13dcf..104c06f66 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 2fd214190..1b3b189a5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index e0c77626e..f00e38cec 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index dfe30a048..1a3be635f 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index f4630fd14..4e63550a9 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,36 @@ --- +- project: + name: openflowplugin-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: openflowplugin + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ + rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f + - odl-maven-jobs + + stream: neon + project: 'openflowplugin' + project-name: 'openflowplugin' + branch: 'master' + build-node: centos7-builder-2c-8g + build-timeout: 90 + mvn-settings: 'openflowplugin-settings' + mvn-goals: 'clean deploy javadoc:aggregate' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream} + email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' + + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-fluorine jobs: @@ -15,7 +47,7 @@ stream: fluorine project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'openflowplugin-settings' diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index d1ca27037..9702ce9c8 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - fluorine: + - neon: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - fluorine: + branch: 'stable/fluorine' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - oxygen: branch: 'stable/oxygen' libuv-version: '1.8.0' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index aef8a0869..537325c8c 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -5,11 +5,16 @@ - 'opflex-release-{stream}' stream: - - fluorine: + - neon: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - fluorine: + branch: 'stable/fluorine' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - oxygen: branch: 'stable/oxygen' libuv-version: '1.8.0' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index d25238db6..ea6cbc85b 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -1,4 +1,23 @@ --- +- project: + name: ovil-neon + jobs: + - odl-maven-jobs + - gerrit-tox-verify + + stream: neon + project: ovil + project-name: ovil + branch: 'master' + mvn-settings: ovil-settings + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + dependencies: '' + email-upstream: '[ovil]' + + # Used by the release job + staging-profile-id: 7b48866c207d8 + - project: name: ovil-fluorine jobs: @@ -8,7 +27,7 @@ stream: fluorine project: ovil project-name: ovil - branch: 'master' + branch: 'stable/fluorine' mvn-settings: ovil-settings mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index d81919881..4eb6ee08b 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index bb00aba5f..7453bddb9 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 034696f57..e110e35a9 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,8 +5,10 @@ - 'ovsdb-daily-full-integration-{stream}' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index dfd1d59ac..247e9e9e6 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: 'ovsdb' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 149e76ade..355384510 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,29 @@ --- +- project: + name: ovsdb-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: ovsdb + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ + rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be + - odl-maven-jobs + + stream: neon + project: 'ovsdb' + project-name: 'ovsdb' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'ovsdb-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a68b188166958 + - project: name: ovsdb-fluorine jobs: @@ -14,7 +39,7 @@ stream: fluorine project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/p4plugin/p4plugin-csit-basic.yaml b/jjb/p4plugin/p4plugin-csit-basic.yaml index 0b892c04d..0ebcba33e 100644 --- a/jjb/p4plugin/p4plugin-csit-basic.yaml +++ b/jjb/p4plugin/p4plugin-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 39e0d8a2d..d96dd73e9 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,22 @@ --- +- project: + name: p4plugin-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'p4plugin' + project-name: 'p4plugin' + branch: 'master' + mvn-settings: 'p4plugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[p4plugin]' + + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-fluorine jobs: @@ -8,7 +26,7 @@ stream: fluorine project: 'p4plugin' project-name: 'p4plugin' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'p4plugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 2a5b39eac..39efbd8de 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -25,6 +25,7 @@ project: 'integration/packaging' stream: + - neon - fluorine - oxygen distro: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 44a7263f0..1c2b45632 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 67d37c5a5..af6a871cf 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,21 @@ --- +- project: + name: packetcable-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'packetcable' + project-name: 'packetcable' + branch: 'master' + mvn-settings: 'packetcable-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[packetcable]' + + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'packetcable' project-name: 'packetcable' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'packetcable-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index ec7f7e56c..81808fbaf 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -1,4 +1,22 @@ --- +- project: + name: persistence-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'persistence' + project-name: 'persistence' + branch: 'master' + jdk: openjdk7 + mvn-settings: 'persistence-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[persistence]' + + # Used by the release job + staging-profile-id: a68d3c2bb44d1 + - project: name: persistence-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'persistence' project-name: 'persistence' - branch: 'master' + branch: 'stable/fluorine' jdk: openjdk7 mvn-settings: 'persistence-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 3239c60ba..c9928da5d 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -1,4 +1,21 @@ --- +- project: + name: reservation-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'reservation' + project-name: 'reservation' + branch: 'master' + mvn-settings: 'reservation-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[reservation]' + + # Used by the release job + staging-profile-id: a68d9bc504037 + - project: name: reservation-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'reservation' project-name: 'reservation' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'reservation-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 91b9e89bc..f78d9edc9 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index bc5124e5f..8f16f1541 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: sdninterfaceapp-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'sdninterfaceapp' + project-name: 'sdninterfaceapp' + branch: 'master' + build-node: centos7-builder-2c-8g + mvn-settings: 'sdninterfaceapp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'bgpcep-merge-{stream}' + email-upstream: '[sdninterfaceapp] [bgpcep]' + + # Used by the release job + staging-profile-id: a68e3d1ff55e3 + - project: name: sdninterfaceapp-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' - branch: 'master' + branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 1c29f81a2..8de079d4f 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'serviceutils' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index b76c17595..dcd019835 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -12,8 +12,10 @@ - odl-maven-jobs stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 56d49f563..05b7fd2f8 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index e085c8e68..d12157507 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 422d4e4d3..1e4833e31 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index ec17b9949..3dfecd935 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'gerrit-tox-verify' stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 2b1c073b7..2633981ab 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: sfc-neon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: sfc + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/ + rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb + - odl-maven-jobs + + stream: neon + project: 'sfc' + project-name: 'sfc' + branch: 'master' + mvn-settings: 'sfc-settings' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + build-timeout: 120 + dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' + email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' + build-node: centos7-builder-8c-8g + + # Used by the release job + staging-profile-id: a68eb361ca48a + - project: name: sfc-fluorine jobs: @@ -13,7 +38,7 @@ stream: fluorine project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'sfc-settings' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' build-timeout: 120 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 1faecb9f5..f22037322 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snbi-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'snbi' + project-name: 'snbi' + branch: 'master' + mvn-settings: 'snbi-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[snbi]' + + # Used by the release job + staging-profile-id: a68f328cefed6 + - project: name: snbi-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'snbi' project-name: 'snbi' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'snbi-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 0ec71847e..881caab18 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snmp-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'snmp' + project-name: 'snmp' + branch: 'master' + mvn-settings: 'snmp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[snmp] [odlparent]' + + # Used by the release job + staging-profile-id: a68fb236b93a6 + - project: name: snmp-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'snmp' project-name: 'snmp' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'snmp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 3da5fb41f..570a42948 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,21 @@ --- +- project: + name: snmp4sdn-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'snmp4sdn' + project-name: 'snmp4sdn' + branch: 'master' + mvn-settings: 'snmp4sdn-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a69034a4b6ef5 + - project: name: snmp4sdn-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'snmp4sdn' project-name: 'snmp4sdn' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'snmp4sdn-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 4c3271bc6..0560a86ea 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 21c8d9aa8..6381465cd 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index 71d140be3..c069051a0 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index f4488e247..d63b20e44 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 922b78895..ef107d5ea 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 9a4f59331..2e0b8fc61 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 3db08c412..2826c29a8 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 0d64f56ae..f7f985e61 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: sxp-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'sxp' + project-name: 'sxp' + branch: 'master' + mvn-settings: 'sxp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[sxp] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a6909c75719b7 + - project: name: sxp-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'sxp' project-name: 'sxp' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'sxp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index 0adb0ca98..09d519ea1 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -1,4 +1,21 @@ --- +- project: + name: systemmetrics-neon + jobs: + - odl-maven-jobs + + project: 'systemmetrics' + project-name: 'systemmetrics' + stream: neon + branch: 'master' + mvn-settings: 'systemmetrics-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a69113575458e + - project: name: systemmetrics-fluorine jobs: @@ -7,7 +24,7 @@ project: 'systemmetrics' project-name: 'systemmetrics' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'systemmetrics-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 81e8d30c2..b7f34dcc5 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,4 +1,29 @@ --- +- project: + name: telemetry-neon + jobs: + - 'odl-maven-jobs' + - '{project-name}-integration-{stream}' + + stream: neon + project: 'telemetry' + project-name: 'telemetry' + branch: 'master' + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'telemetry-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[telemetry]' + archive-artifacts: '' + + # Used by the release job + staging-profile-id: 8ed9c52266504 + - project: name: telemetry-fluorine jobs: @@ -8,7 +33,7 @@ stream: fluorine project: 'telemetry' project-name: 'telemetry' - branch: 'master' + branch: 'stable/fluorine' jdks: - openjdk8 maven: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 28faf07c0..3a328e418 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -1,4 +1,21 @@ --- +- project: + name: topoprocessing-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'topoprocessing' + project-name: 'topoprocessing' + branch: 'master' + mvn-settings: 'topoprocessing-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' + + # Used by the release job + staging-profile-id: a691bbe2328cb + - project: name: topoprocessing-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'topoprocessing' project-name: 'topoprocessing' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'topoprocessing-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index c73709f04..9b8855f92 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,21 @@ --- +- project: + name: transportpce-neon + jobs: + - odl-maven-jobs + + project: 'transportpce' + project-name: 'transportpce' + stream: neon + branch: 'master' + mvn-settings: 'transportpce-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' + + # Used by the release job + staging-profile-id: a6927323fa3d4 + - project: name: transportpce-fluorine jobs: @@ -7,7 +24,7 @@ project: 'transportpce' project-name: 'transportpce' stream: fluorine - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'transportpce-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 66c28d422..98e14e7b8 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features' diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 906577b5b..86d93adc1 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 689105582..e1eb4f850 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index fcffa2ac0..1f6ac65de 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 6b5dede2e..1958b42e7 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,21 @@ --- +- project: + name: tsdr-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'tsdr' + project-name: 'tsdr' + branch: 'master' + mvn-settings: 'tsdr-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[tsdr]' + + # Used by the release job + staging-profile-id: a69373036303c + - project: name: tsdr-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'tsdr' project-name: 'tsdr' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'tsdr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 1b3deeb8d..b271cb319 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -1,4 +1,21 @@ --- +- project: + name: ttp-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'ttp' + project-name: 'ttp' + branch: 'master' + mvn-settings: 'ttp-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[ttp] [odlparent]' + + # Used by the release job + staging-profile-id: a693f948563d5 + - project: name: ttp-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'ttp' project-name: 'ttp' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'ttp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 28d6dd776..895ac24d7 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,22 @@ --- +- project: + name: unimgr-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'unimgr' + project-name: 'unimgr' + branch: 'master' + mvn-settings: 'unimgr-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'ovsdb-merge-{stream}' + email-upstream: '[unimgr] [ovsdb]' + build-node: centos7-builder-4c-16g + + # Used by the release job + staging-profile-id: a695d0a0b8d51 + - project: name: unimgr-fluorine jobs: @@ -7,7 +25,7 @@ stream: fluorine project: 'unimgr' project-name: 'unimgr' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 72846d311..732540e0b 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index c0a3cf701..0b71f0a2b 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 32a2ee35e..1e31b30a4 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,22 @@ --- +- project: + name: usc-neon + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + + stream: neon + project: 'usc' + project-name: 'usc' + branch: 'master' + mvn-settings: 'usc-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' + email-upstream: '[usc] [controller] [yangtools] [odlparent]' + + # Used by the release job + staging-profile-id: a697b633b3ffe + - project: name: usc-fluorine jobs: @@ -8,7 +26,7 @@ stream: fluorine project: 'usc' project-name: 'usc' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'usc-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index edbf3601e..38fdd2695 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index ce250f832..edaee783d 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -1,4 +1,21 @@ --- +- project: + name: usecplugin-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'usecplugin' + project-name: 'usecplugin' + branch: 'master' + mvn-settings: 'usecplugin-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'openflowplugin-merge-{stream}' + email-upstream: '[usecplugin] [openflowplugin]' + + # Used by the release job + staging-profile-id: a69902281e037 + - project: name: usecplugin-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'usecplugin' project-name: 'usecplugin' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'usecplugin-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index ca5d56edd..55110f83a 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -1,4 +1,21 @@ --- +- project: + name: yang-push-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'yang-push' + project-name: 'yang-push' + branch: 'master' + mvn-settings: 'yang-push-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[yang-push]' + + # Used by the release job + staging-profile-id: a69aae2832869 + - project: name: yang-push-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'yang-push' project-name: 'yang-push' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'yang-push-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 18be81167..2468bb247 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -1,4 +1,21 @@ --- +- project: + name: yangide-neon + jobs: + - odl-maven-jobs + + stream: neon + project: 'yangide' + project-name: 'yangide' + branch: 'master' + mvn-settings: 'yangide-settings' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[yangide] [odlparent] [yangtools]' + + # Used by the release job + staging-profile-id: fba306956f98 + - project: name: yangide-fluorine jobs: @@ -7,7 +24,7 @@ stream: fluorine project: 'yangide' project-name: 'yangide' - branch: 'master' + branch: 'stable/fluorine' mvn-settings: 'yangide-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 5a68f2b1e..a40bcf5ab 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,8 +12,10 @@ # Project branches. stream: - - fluorine: + - neon: branch: 'master' + - fluorine: + branch: 'stable/fluorine' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 73f910c11..9e1167c0d 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: 'yangtools' stream: - - fluorine: + - neon: branch: 'master' os-branch: 'queens' + - fluorine: + branch: 'stable/fluorine' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' os-branch: 'queens' -- 2.36.6