From 9319e02772bba40e23bca708918c482503fe9ae1 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 11 Feb 2020 22:34:33 +1000 Subject: [PATCH] Magnesium branch cut Create jobs for 'stable/magnesium', and move master to aluminium. Change-Id: Ic0982025a47db0d4ea1bc8ca53d3370edc7d5803 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 6 +- jjb/aaa/aaa-patch-test.yaml | 10 ++- jjb/aaa/aaa.yaml | 27 ++++++- jjb/alt-datastores/alt-datastores.yaml | 28 ++++++- jjb/alto/alto-csit-setup.yaml | 5 +- jjb/alto/alto.yaml | 24 +++++- jjb/ansible/ansible.yaml | 4 +- jjb/archetypes/archetypes.yaml | 28 ++++++- jjb/autorelease/autorelease-projects.yaml | 7 +- .../autorelease-version-management.yaml | 4 +- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 5 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 5 +- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 5 +- .../bgpcep-csit-bgpclustering-longevity.yaml | 5 +- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 5 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 5 +- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 5 +- jjb/bgpcep/bgpcep-patch-test.yaml | 5 +- jjb/bgpcep/bgpcep.yaml | 34 +++++++- jjb/bier/bier-csit-basic.yaml | 5 +- jjb/bier/bier.yaml | 25 +++++- jjb/coe/coe.yaml | 27 ++++++- jjb/controller/controller-csit-akka1.yaml | 5 +- .../controller-csit-clustering.yaml | 5 +- .../controller-csit-cs-chasing-leader.yaml | 5 +- .../controller-csit-cs-partnheal.yaml | 5 +- ...ontroller-csit-ddb-expl-lead-movement.yaml | 5 +- .../controller-csit-dnb-noloss.yaml | 5 +- .../controller-csit-drb-partnheal.yaml | 5 +- .../controller-csit-drb-precedence.yaml | 5 +- .../controller-csit-dsbenchmark-cluster.yaml | 5 +- .../controller-csit-dsbenchmark.yaml | 5 +- .../controller-csit-rest-cars-perf.yaml | 5 +- .../controller-csit-rest-clust-cars-perf.yaml | 5 +- jjb/controller/controller-patch-test.yaml | 9 ++- jjb/controller/controller.yaml | 30 +++++++- jjb/daexim/daexim-csit-basic.yaml | 5 +- jjb/daexim/daexim-csit-clustering-basic.yaml | 5 +- jjb/daexim/daexim.yaml | 27 ++++++- jjb/detnet/detnet.yaml | 29 ++++++- jjb/dluxapps/dluxapps-csit-yangman.yaml | 5 +- jjb/dluxapps/dluxapps.yaml | 24 +++++- jjb/docs/docs-rtd.yaml | 4 +- jjb/genius/genius-csit-genius.yaml | 5 +- jjb/genius/genius-patch-test.yaml | 10 ++- jjb/genius/genius.yaml | 38 ++++++++- ...groupbasedpolicy-csit-1node-openstack.yaml | 5 +- .../groupbasedpolicy-csit-3node.yaml | 5 +- .../groupbasedpolicy-csit-6node.yaml | 5 +- .../groupbasedpolicy-csit-clustering.yaml | 5 +- .../groupbasedpolicy-csit-sxp.yaml | 5 +- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 31 +++++++- jjb/honeycomb/vbd/vbd.yaml | 22 +++++- jjb/infrautils/infrautils-patch-test.yaml | 9 ++- jjb/infrautils/infrautils.yaml | 29 ++++++- jjb/integration/csit-jobs-aluminium.lst | 77 +++++++++++++++++++ .../distribution-csit-userfeatures.yaml | 5 +- .../distribution/distribution-jobs.yaml | 7 +- jjb/integration/integration-test-jobs.yaml | 12 ++- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 5 +- jjb/jsonrpc/jsonrpc.yaml | 29 ++++++- .../l2switch-csit-host-scalability-daily.yaml | 5 +- jjb/l2switch/l2switch-csit-scalability.yaml | 5 +- jjb/l2switch/l2switch-csit-switch.yaml | 5 +- jjb/l2switch/l2switch-patch-test.yaml | 11 ++- jjb/l2switch/l2switch.yaml | 28 ++++++- .../lispflowmapping-csit-msmr.yaml | 5 +- .../lispflowmapping-csit-performance.yaml | 5 +- jjb/lispflowmapping/lispflowmapping.yaml | 34 +++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 +- jjb/mdsal/mdsal-patch-test.yaml | 10 ++- jjb/nemo/nemo-csit-engine.yaml | 5 +- jjb/nemo/nemo.yaml | 23 +++++- jjb/netconf/netconf-clustering-scale.yaml | 5 +- jjb/netconf/netconf-clustering.yaml | 5 +- jjb/netconf/netconf-csit-callhome.yaml | 5 +- jjb/netconf/netconf-patch-test.yaml | 10 ++- jjb/netconf/netconf-scale.yaml | 5 +- jjb/netconf/netconf-userfeatures.yaml | 5 +- jjb/netconf/netconf.yaml | 30 +++++++- jjb/netvirt/netvirt-csit-multi-apex.yaml | 5 +- .../netvirt-csit-multi-openstack-upgrade.yaml | 5 +- jjb/netvirt/netvirt-patch-test.yaml | 12 +-- jjb/netvirt/netvirt.yaml | 42 +++++++++- jjb/neutron/neutron-patch-test.yaml | 9 ++- jjb/neutron/neutron.yaml | 24 +++++- jjb/odlparent/odlparent-patch-test.yaml | 9 ++- jjb/odltools/odltools-csit.yaml | 5 +- jjb/odltools/odltools-patch-test.yaml | 4 +- jjb/odltools/odltools.yaml | 4 +- jjb/of-config/of-config.yaml | 23 +++++- ...ugin-csit-bundle-based-reconciliation.yaml | 5 +- .../openflowplugin-csit-cbench.yaml | 5 +- ...flowplugin-csit-clustering-bulkomatic.yaml | 5 +- ...lugin-csit-clustering-perf-bulkomatic.yaml | 5 +- .../openflowplugin-csit-clustering.yaml | 5 +- .../openflowplugin-csit-flow-services.yaml | 5 +- .../openflowplugin-csit-longevity.yaml | 5 +- .../openflowplugin-csit-perf-bulkomatic.yaml | 5 +- ...flowplugin-csit-perf-stats-collection.yaml | 5 +- .../openflowplugin-csit-sanity.yaml | 5 +- .../openflowplugin-csit-scale-link.yaml | 5 +- .../openflowplugin-csit-scale-switch.yaml | 5 +- .../openflowplugin-csit-scale.yaml | 5 +- .../openflowplugin-patch-test.yaml | 9 ++- jjb/openflowplugin/openflowplugin.yaml | 39 +++++++++- jjb/opflex/opflex-custom.yaml | 7 +- jjb/opflex/opflex.yaml | 7 +- jjb/ovsdb/ovsdb-csit-clustering.yaml | 5 +- jjb/ovsdb/ovsdb-csit-southbound.yaml | 5 +- jjb/ovsdb/ovsdb-full-integration.yaml | 5 +- jjb/ovsdb/ovsdb-patch-test.yaml | 9 ++- jjb/ovsdb/ovsdb.yaml | 32 +++++++- jjb/p4plugin/p4plugin.yaml | 23 +++++- jjb/packetcable/packetcable-csit-pcmm.yaml | 5 +- jjb/packetcable/packetcable.yaml | 23 +++++- jjb/serviceutils/serviceutils-patch-test.yaml | 8 +- jjb/serviceutils/serviceutils.yaml | 35 ++++++++- jjb/sfc/sfc-csit-full-deploy.yaml | 5 +- jjb/sfc/sfc-csit-rest-basic.yaml | 5 +- jjb/sfc/sfc-patch-test.yaml | 10 ++- jjb/sfc/sfc-python.yaml | 4 +- jjb/sfc/sfc.yaml | 28 ++++++- jjb/snmp/snmp.yaml | 22 +++++- jjb/snmp4sdn/snmp4sdn.yaml | 27 ++++++- jjb/sxp/sxp-csit-basic.yaml | 5 +- jjb/sxp/sxp-csit-binding-origin.yaml | 5 +- jjb/sxp/sxp-csit-cluster-binding.yaml | 5 +- jjb/sxp/sxp-csit-clustering.yaml | 5 +- jjb/sxp/sxp-csit-filtering.yaml | 5 +- jjb/sxp/sxp-csit-performance.yaml | 5 +- jjb/sxp/sxp-csit-topology.yaml | 5 +- jjb/sxp/sxp.yaml | 31 +++++++- jjb/telemetry/telemetry-csit-basic.yaml | 5 +- jjb/telemetry/telemetry.yaml | 29 ++++++- jjb/transportpce/transportpce.yaml | 30 +++++++- jjb/tsdr/tsdr-csit-cassandra.yaml | 5 +- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 5 +- jjb/tsdr/tsdr-csit-hbase.yaml | 5 +- jjb/tsdr/tsdr-csit-hsqldb.yaml | 5 +- jjb/tsdr/tsdr.yaml | 27 ++++++- jjb/unimgr/unimgr.yaml | 28 ++++++- jjb/usc/usc-csit-tcp.yaml | 5 +- jjb/usc/usc.yaml | 23 +++++- jjb/yangtools/yangtools-csit-system.yaml | 5 +- jjb/yangtools/yangtools-patch-test.yaml | 11 +-- 146 files changed, 1534 insertions(+), 217 deletions(-) create mode 100644 jjb/integration/csit-jobs-aluminium.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index b67ca0d56..0d8d75ac2 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: @@ -34,4 +37,3 @@ # Don't spin up mininet vms as aaa-csit-authn jobs don't need them tools_system_count: 0 - diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 83024fb9f..5c254fb5c 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,16 +7,18 @@ project: 'aaa' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 379aeb37e..b1a4f8192 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,29 @@ --- +- project: + name: aaa-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: aaa + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/ + rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'aaa' + project-name: 'aaa' + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'aaa-settings' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -14,7 +39,7 @@ stream: magnesium project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'aaa-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index 5f3a87902..dc359c756 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -1,6 +1,6 @@ --- - project: - name: alt-datastores-magnesium + name: alt-datastores-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'alt-datastores' project-name: 'alt-datastores' branch: 'master' @@ -24,6 +24,30 @@ # Used by the release job staging-profile-id: daa2b00117ed6 +- project: + name: alt-datastores-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: alt-datastores + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/ + rtd-token: dc412b0cc43fba4098173878f970e76380ce0084 + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'alt-datastores' + project-name: 'alt-datastores' + branch: 'stable/magnesium' + mvn-settings: 'alt-datastores-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: daa2b00117ed6 + - project: name: alt-datastores-sodium jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 5814a47b9..f06a3f08c 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 509485f5d..15bbeb59f 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,12 +1,12 @@ --- - project: - name: alto-magnesium + name: alto-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'alto' project-name: 'alto' branch: 'master' @@ -20,6 +20,26 @@ # Used by the release job staging-profile-id: 931eabae9693c +- project: + name: alto-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'alto' + project-name: 'alto' + branch: 'stable/magnesium' + build-node: centos7-builder-2c-8g + mvn-settings: 'alto-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'l2switch-merge-{stream}' + email-upstream: '[alto] [l2switch]' + disable-job: true + + # Used by the release job + staging-profile-id: 931eabae9693c + - project: name: alto-sodium jobs: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index 5f8320117..e48200e20 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -9,8 +9,10 @@ - odl-maven-verify-jobs stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 8c1614b4e..0cb92fb19 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,6 +1,6 @@ --- - project: - name: archetypes-magnesium + name: archetypes-aluminium jobs: - gerrit-release-merge - gerrit-maven-clm @@ -12,7 +12,7 @@ sign-artifacts: true - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'archetypes' project-name: 'archetypes' branch: 'master' @@ -24,6 +24,30 @@ # Used by the release job staging-profile-id: d88dcfe6ce48d +- project: + name: archetypes-magnesium + jobs: + - gerrit-maven-clm + - '{project-name}-merge-{stream}': + build-timeout: 180 + cron: '@daily' + mvn-goals: clean install -V -Dmaven.compile.fork=true + - gerrit-maven-stage: + sign-artifacts: true + - odl-maven-verify-jobs + + stream: magnesium + project: 'archetypes' + project-name: 'archetypes' + branch: 'stable/magnesium' + java-version: 'openjdk11' + 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-sodium jobs: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 738b664ae..ed3c68f4b 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -52,9 +52,12 @@ build-node: centos7-autorelease-4c-16g stream: - - magnesium: + - aluminium: branch: 'master' - integration-test: magnesium + integration-test: aluminium-dev-null + - magnesium: + branch: 'stable/magnesium' + integration-test: magnesium-dev-null - sodium: branch: 'stable/sodium' integration-test: sodium-dev-null diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index d31b686c5..672a199dd 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -11,8 +11,10 @@ build-node: centos7-builder-2c-8g stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 023597fe1..234c1570b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 37bcaa240..386d9fad4 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 3c287c3ba..57cee509d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 8696e4096..856a65492 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index c2426f069..f9430de84 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 56cfa04d7..bdee08fe2 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 3e3f54d91..e556ae51f 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 15d1e0cc2..704397a30 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index a13b03118..23d8e956e 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,36 @@ --- +- project: + name: bgpcep-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: bgpcep + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/ + rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'bgpcep' + project-name: 'bgpcep' + build-node: centos7-builder-8c-8g + build-timeout: 120 + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'bgpcep-settings' + mvn-opts: '-Xmx2048m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream} + email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]' + + # Used by the release job + staging-profile-id: 9427a05049030 + - project: name: bgpcep-magnesium jobs: @@ -17,7 +49,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'bgpcep-settings' mvn-opts: '-Xmx2048m' diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 00d53d026..f705a3f18 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index b9bbc1d08..0d7c677fe 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,12 +1,12 @@ --- - project: - name: bier-magnesium + name: bier-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'bier' project-name: 'bier' branch: 'master' @@ -21,6 +21,27 @@ # Used by the release job staging-profile-id: 942a8075b1f2a +- project: + name: bier-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'bier' + project-name: 'bier' + branch: 'stable/magnesium' + build-node: centos7-builder-2c-8g + build-timeout: 90 + mvn-settings: 'bier-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[bier]' + disable-job: true + + # Used by the release job + staging-profile-id: 942a8075b1f2a + - project: name: bier-sodium jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index b321b2bb7..fe0191b8d 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,29 @@ --- +- project: + name: coe-aluminium + jobs: + - '{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-jdk11 + - odl-maven-verify-jobs + + project: 'coe' + project-name: 'coe' + stream: aluminium + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'coe-settings' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -13,7 +38,7 @@ project: 'coe' project-name: 'coe' stream: magnesium - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'coe-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index c1744ecf1..8eb807845 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ functionality: 'akka1' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 770fc4619..928a39ef8 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ elasticsearch-attribute: 'disabled' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 817c8cec9..65aa0a6af 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 09e74efcc..90352ea8f 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index a8bc4c565..0018a8248 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index e26330c50..e8cb03bb8 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 239f268a3..1ae96bd6c 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index c26699bd4..adabb3919 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 909683754..06cc97256 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 2437f3aff..c482bbeb4 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 660f6d599..1c69e6869 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 995f6f9f4..9f2b57789 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 898143288..d65404005 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,17 +7,18 @@ project: 'controller' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 8efe2f4eb..8b7e54375 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,32 @@ --- +- project: + name: controller-aluminium + jobs: + - '{project-name}-distribution-check-{stream}': + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: controller + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/ + rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'controller' + project-name: 'controller' + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'controller-settings' + mvn-goals: 'clean deploy -Pintegrationtests,docs' + mvn-opts: '-Xmx4096m -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-magnesium jobs: @@ -14,7 +42,7 @@ stream: magnesium project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index e7c7948fe..d59198160 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 9ca289f08..67d500fdc 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index f63e557dd..556ac2a7e 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: daexim + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ + rtd-token: 76284f12638574f131cdccdf257d852d07c195fc + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: 'daexim' + project-name: 'daexim' + stream: aluminium + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'daexim-settings' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -14,7 +39,7 @@ project: 'daexim' project-name: 'daexim' stream: magnesium - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 1e68013b4..2cade9698 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -1,6 +1,6 @@ --- - project: - name: detnet-magnesium + name: detnet-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'detnet' project-name: 'detnet' branch: 'master' @@ -25,6 +25,31 @@ # Used by the release job staging-profile-id: 8981976d0fea7 +- project: + name: detnet-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: detnet + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/ + rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: magnesium + project: 'detnet' + project-name: 'detnet' + branch: 'stable/magnesium' + java-version: 'openjdk11' + mvn-settings: 'detnet-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[detnet] [odlparent] [yangtools] [controller]' + build-node: centos7-docker-2c-8g + + # Used by the release job + staging-profile-id: 8981976d0fea7 + - project: name: detnet-sonar jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 162d6d93f..b6e9295c8 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 485570b5c..982601c81 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,6 +1,6 @@ --- - project: - name: dluxapps-magnesium + name: dluxapps-aluminium jobs: - gerrit-release-merge - odl-maven-jobs @@ -8,7 +8,7 @@ project: 'dluxapps' project-name: 'dluxapps' - stream: magnesium + stream: aluminium branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' @@ -20,6 +20,26 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 +- project: + name: dluxapps-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: magnesium + branch: 'stable/magnesium' + build-node: centos7-builder-2c-8g + mvn-settings: 'dluxapps-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' + disable-job: true + + # Used by the release job + staging-profile-id: 96e6fb1e65bf9 + - project: name: dluxapps-sodium jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index b61f6b06f..91106df7e 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index ac90a6e0c..84ea8aa68 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -16,9 +16,12 @@ testplan: '{project}-{functionality}.txt' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index b1b96a8fb..a9fb132c6 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,16 +7,18 @@ project: 'genius' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' feature: - netvirt: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index e0c98e504..a58e783e4 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,40 @@ --- +- project: + name: genius-aluminium + 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-jdk11 + - odl-maven-verify-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: aluminium + project: 'genius' + project-name: 'genius' + branch: 'master' + build-node: centos7-builder-2c-8g + java-version: 'openjdk11' + mvn-settings: 'genius-settings' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -18,7 +54,7 @@ stream: magnesium project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/magnesium' build-node: centos7-builder-2c-8g java-version: 'openjdk11' mvn-settings: 'genius-settings' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index b232113d6..05d84a605 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -20,9 +20,12 @@ functionality: 'openstack' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index fbd23e6ad..c52fa0a45 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index e32e60d69..5e6f5a28e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 78462910d..d65c801dc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index af0df03a3..3e78d0547 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index dcec8895c..eb3cb602b 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,12 +1,12 @@ --- - project: - name: groupbasedpolicy-magnesium + name: groupbasedpolicy-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' @@ -27,6 +27,33 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 +- project: + name: groupbasedpolicy-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'groupbasedpolicy' + project-name: 'groupbasedpolicy' + branch: 'stable/magnesium' + build-node: centos7-builder-2c-8g + mvn-settings: 'groupbasedpolicy-settings' + mvn-goals: '-U clean deploy findbugs:findbugs' + mvn-opts: '-Xmx1024m' + 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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96fbb93f95a76 + - project: name: groupbasedpolicy-sodium jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index b6956c821..68704e483 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,12 +1,12 @@ --- - project: - name: vbd-magnesium + name: vbd-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'honeycomb/vbd' project-name: 'vbd' branch: 'master' @@ -18,6 +18,24 @@ # Used by the release job staging-profile-id: 96fc362c36862 +- project: + name: vbd-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'honeycomb/vbd' + project-name: 'vbd' + branch: 'stable/magnesium' + mvn-settings: 'honeycomb-vbd-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[vbd]' + + # Used by the release job + staging-profile-id: 96fc362c36862 + - project: name: vbd-sodium jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index fe18e0c01..ad61a69ae 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,17 +7,18 @@ project: 'infrautils' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' jre: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 18ec7c823..0e5f0119f 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,31 @@ --- +- project: + name: infrautils-aluminium + 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-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'infrautils' + project-name: 'infrautils' + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'infrautils-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[infrautils] [odlparent]' + + # Used by the release job + staging-profile-id: 96fca0367756c + - project: name: infrautils-magnesium jobs: @@ -16,7 +43,7 @@ stream: magnesium project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst new file mode 100644 index 000000000..b5b03b53a --- /dev/null +++ b/jjb/integration/csit-jobs-aluminium.lst @@ -0,0 +1,77 @@ +aaa-csit-1node-authn-all-sodium, +bgpcep-csit-1node-bgp-ingest-all-sodium, +bgpcep-csit-1node-bgp-ingest-mixed-all-sodium, +bgpcep-csit-1node-throughpcep-all-sodium, +bgpcep-csit-1node-userfeatures-all-sodium, +bgpcep-csit-3node-bgpclustering-all-sodium, +bgpcep-csit-3node-bgpclustering-ha-only-sodium, +controller-csit-1node-akka1-all-sodium, +controller-csit-1node-benchmark-all-sodium, +controller-csit-1node-rest-cars-perf-all-sodium, +controller-csit-3node-benchmark-all-sodium, +controller-csit-3node-clustering-ask-all-sodium, +controller-csit-3node-clustering-tell-all-sodium, +controller-csit-3node-rest-clust-cars-perf-ask-only-sodium, +controller-csit-3node-rest-clust-cars-perf-tell-only-sodium, +daexim-csit-1node-basic-only-sodium, +daexim-csit-3node-clustering-basic-only-sodium, +distribution-csit-1node-userfeatures-all-sodium, +distribution-csit-managed-sodium, +genius-csit-1node-upstream-only-sodium, +genius-csit-3node-upstream-only-sodium, +lispflowmapping-csit-1node-msmr-all-sodium, +lispflowmapping-csit-1node-performance-only-sodium, +lispflowmapping-csit-3node-msmr-all-sodium, +mdsal-csit-1node-bindingv1-only-sodium, +netconf-csit-1node-callhome-only-sodium, +netconf-csit-1node-scale-max-devices-only-sodium, +netconf-csit-1node-scale-only-sodium, +netconf-csit-1node-userfeatures-all-sodium, +netconf-csit-3node-clustering-only-sodium, +netconf-csit-3node-clustering-scale-only-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, +odltools-csit-1node-upstream-all-sodium, +openflowplugin-csit-1node-bundle-based-reconciliation-all-sodium, +openflowplugin-csit-1node-cbench-only-sodium, +openflowplugin-csit-1node-flow-services-all-sodium, +openflowplugin-csit-1node-perf-bulkomatic-only-sodium, +openflowplugin-csit-1node-perf-stats-collection-only-sodium, +openflowplugin-csit-1node-scale-link-only-sodium, +openflowplugin-csit-1node-scale-only-sodium, +openflowplugin-csit-1node-scale-switch-only-sodium, +openflowplugin-csit-3node-clustering-bulkomatic-only-sodium, +openflowplugin-csit-3node-clustering-only-sodium, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sodium, +ovsdb-csit-1node-upstream-southbound-all-sodium, +ovsdb-csit-3node-upstream-clustering-only-sodium, +sfc-csit-3node-docker-full-deploy-all-sodium, +sfc-csit-3node-rest-basic-all-sodium, +yangtools-csit-1node-system-only-sodium, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 440077193..35c33656a 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index e6d5806a4..93b2925fe 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -21,9 +21,12 @@ nexus-iq-stage: release email-upstream: '[int/dist]' stream: - - magnesium: + - aluminium: branch: 'master' - java-version: 'openjdk11' + jre: 'openjdk11' + karaf-version: odl + - magnesium: + branch: 'stable/magnesium' jre: 'openjdk11' karaf-version: odl - sodium: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 78ae35128..eb179df97 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,10 +18,20 @@ # CSIT Lists in defaults.yaml stream: - - magnesium: + - aluminium: branch: 'master' mvn-version: 'mvn35' java-version: 'openjdk11' + csit-list: !include: csit-jobs-aluminium.lst + build-order: > + odlparent yangtools mdsal infrautils controller serviceutils aaa netconf + daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt + bgpcep integration/distribution + + - magnesium: + branch: 'stable/magnesium' + mvn-version: 'mvn35' + java-version: 'openjdk11' csit-list: !include: csit-jobs-magnesium.lst build-order: > odlparent yangtools mdsal infrautils controller serviceutils aaa netconf diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index f8ef58d36..8ee71ddee 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index d9ac0887c..7e12df969 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,6 +1,6 @@ --- - project: - name: jsonrpc-magnesium + name: jsonrpc-aluminium jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-rtd-jobs': @@ -14,7 +14,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' - stream: magnesium + stream: aluminium java-version: 'openjdk11' branch: 'master' mvn-settings: 'jsonrpc-settings' @@ -25,6 +25,31 @@ # Used by the release job staging-profile-id: 96fdf4408765d +- project: + name: jsonrpc-magnesium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: jsonrpc + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ + rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: magnesium + java-version: 'openjdk11' + branch: 'stable/magnesium' + mvn-settings: 'jsonrpc-settings' + mvn-opts: '-Xmx1024m' + 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-sodium jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index c98b2e4ec..db2687d8e 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 6263547c9..c83124089 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index c80044e17..a4bf5a4dd 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index a2d0fa8fb..9b161f4ae 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,16 +10,19 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' - java-version: 'openjdk11' + jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' + os-branch: 'queens' + feature: - all: csit-list: > diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 1253ed552..20dcd26ff 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,12 +1,12 @@ --- - project: - name: l2switch-magnesium + name: l2switch-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'l2switch' project-name: 'l2switch' branch: 'master' @@ -24,6 +24,30 @@ # Used by the release job staging-profile-id: 96fee85953ca0 +- project: + name: l2switch-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'l2switch' + project-name: 'l2switch' + branch: 'stable/magnesium' + mvn-settings: 'l2switch-settings' + mvn-opts: '-Xmx1024m -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]' + disable-job: true + + # Used by the release job + staging-profile-id: 96fee85953ca0 + - project: name: l2switch-sodium jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index a73f0402a..b2e8a24b6 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index a5f30b476..5d8336bf0 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 0b99c46c5..acab71681 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,36 @@ --- +- project: + name: lispflowmapping-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: lispflowmapping + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ + rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'lispflowmapping' + project-name: 'lispflowmapping' + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'lispflowmapping-settings' + mvn-goals: 'clean deploy -DrepoBuild' + mvn-opts: '-Xmx2048m -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-magnesium jobs: @@ -15,7 +47,7 @@ stream: magnesium project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy -DrepoBuild' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 44da788e2..deb5c3dee 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ functionality: 'bindingv1' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 87a3cbd2b..dc1aa8f29 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,16 +7,18 @@ project: 'mdsal' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index b6c6f3b58..d74980f50 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 7489622dd..735706fd7 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,12 +1,12 @@ --- - project: - name: nemo-magnesium + name: nemo-aluminium jobs: - odl-maven-jobs - odl-maven-verify-jobs - gerrit-release-merge - stream: magnesium + stream: aluminium project: 'nemo' project-name: 'nemo' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a67a9890f6202 +- project: + name: nemo-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'nemo' + project-name: 'nemo' + branch: 'stable/magnesium' + mvn-settings: 'nemo-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[nemo]' + disable-job: true + + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-sodium jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 64c987eb9..fa1e35b84 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 37bfcca3c..7879f3579 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 1e307e011..fea79f43c 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 92b181aa7..dc7215445 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,16 +7,18 @@ project: 'netconf' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' feature: - core: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 44118a8a9..5335547db 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 01ad34ef7..d27ef73d3 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 8a308cb73..d983fb0f9 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,32 @@ --- +- project: + name: netconf-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: netconf + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/ + rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'netconf' + project-name: 'netconf' + branch: 'master' + build-node: centos7-builder-2c-8g + java-version: 'openjdk11' + mvn-settings: 'netconf-settings' + mvn-goals: 'clean deploy -Pintegrationtests' + mvn-opts: '-Xmx2048m -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-magnesium jobs: @@ -14,7 +42,7 @@ stream: magnesium project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/magnesium' build-node: centos7-builder-2c-8g java-version: 'openjdk11' mvn-settings: 'netconf-settings' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index 3b23bbf1a..5bc86374d 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -8,9 +8,12 @@ project: 'netvirt' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 1d169c4b0..4d829e8c3 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -7,9 +7,12 @@ project: 'netvirt' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index e141afbc2..017474df3 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,16 +7,18 @@ project: 'netvirt' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' - java-version: 'openjdk11' + jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 375e2c565..b0afc46ea 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -1,4 +1,44 @@ --- +- project: + name: netvirt-aluminium + 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: netvirt + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/ + rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c + - gerrit-tox-verify + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: aluminium + branch: 'master' + + project: 'netvirt' + project-name: 'netvirt' + + java-version: 'openjdk11' + mvn-settings: 'netvirt-settings' + mvn-opts: '-Xmx2048m' + build-timeout: 90 + build-node: centos7-builder-8c-8g + dependencies: > + genius-merge-{stream}, + neutron-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + ovsdb-merge-{stream} + email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]' + + # Used by the release job + staging-profile-id: a67da0ffbb1ba + - project: name: netvirt-magnesium jobs: @@ -18,7 +58,7 @@ block_on_csit: false stream: magnesium - branch: 'master' + branch: 'stable/magnesium' project: 'netvirt' project-name: 'netvirt' diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index e6837b011..2c79fccf2 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,15 +7,16 @@ project: 'neutron' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 6ece2ce8b..4ac441c60 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,26 @@ --- +- project: + name: neutron-aluminium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'neutron' + project-name: 'neutron' + build-timeout: 90 + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'neutron-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' + email-upstream: '[neutron] [odlparent] [aaa]' + + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-magnesium jobs: @@ -11,7 +33,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 2dbb20fbd..f03912f5d 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,15 +7,16 @@ project: 'odlparent' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 0ccc84561..c66675923 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,9 +10,12 @@ testplan: '{project}-basic.txt' stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index f3d77f317..67f5768d5 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 4e2743d34..f3d7cc3b5 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -12,8 +12,10 @@ rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2 stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 1800cf6de..2654fe70b 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,12 +1,12 @@ --- - project: - name: of-config-magnesium + name: of-config-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'of-config' project-name: 'of-config' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a6880455efe67 +- project: + name: of-config-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'of-config' + project-name: 'of-config' + branch: 'stable/magnesium' + mvn-settings: 'of-config-settings' + mvn-opts: '-Xmx1024m' + dependencies: netconf-merge-{stream}' + email-upstream: '[of-config] [netconf]' + disable-job: true + + # Used by the release job + staging-profile-id: a6880455efe67 + - project: name: of-config-sodium jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 4dbaa9ce2..055b1c22d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 31f189ce2..ab79f3271 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 6e4981092..d7937aa34 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 550864c2b..61116a0fa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index c3b4c4df0..8a2055228 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 4f47b917d..1b1870945 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 81258823d..1d14c2bc5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -16,9 +16,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index df510fc99..cfc24608e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index d2f324fb0..e5372c422 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index e413c3a29..be78a664e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 408a310aa..cfc8f6429 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 8cf859bb3..c90e944a0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index ce2c18247..686c0c73c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 7da1a5c09..857892009 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,17 +9,18 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 9831cece4..5d40fcf36 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,41 @@ --- +- project: + name: openflowplugin-aluminium + 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-jdk11 + - odl-maven-verify-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: aluminium + project: 'openflowplugin' + project-name: 'openflowplugin' + branch: 'master' + build-node: centos7-builder-2c-8g + build-timeout: 90 + java-version: 'openjdk11' + mvn-settings: 'openflowplugin-settings' + mvn-goals: 'clean deploy javadoc:aggregate' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -19,7 +56,7 @@ stream: magnesium project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/magnesium' build-node: centos7-builder-2c-8g build-timeout: 90 java-version: 'openjdk11' diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 939a3673c..53e085f0f 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - magnesium: + - aluminium: branch: 'master' libuv-version: '1.20.2' rapidjson-version: '1.1.0' openvswitch-version: '2.12.0' + - magnesium: + branch: 'stable/magnesium' + libuv-version: '1.20.2' + rapidjson-version: '1.1.0' + openvswitch-version: '2.12.0' - sodium: branch: 'stable/sodium' libuv-version: '1.8.0' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 6511ce90c..002d1ed62 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -10,11 +10,16 @@ - 'opflex-release-{stream}' stream: - - magnesium: + - aluminium: branch: 'master' libuv-version: '1.20.2' rapidjson-version: '1.1.0' openvswitch-version: '2.12.0' + - magnesium: + branch: 'stable/magnesium' + libuv-version: '1.20.2' + rapidjson-version: '1.1.0' + openvswitch-version: '2.12.0' - sodium: branch: 'stable/sodium' libuv-version: '1.8.0' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 5a8ecae80..40a4c9e8e 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,8 +14,11 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' jre: 'openjdk11' - sodium: branch: 'stable/sodium' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 4da2bcbd1..a9cbe5b17 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,8 +14,11 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' jre: 'openjdk11' - sodium: branch: 'stable/sodium' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 1acc416fa..e8245a6d9 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,8 +5,11 @@ - 'ovsdb-daily-full-integration-{stream}' stream: - - magnesium: + - aluminium: branch: 'master' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 23cf86b4b..9663ee6e5 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,17 +8,18 @@ project: 'ovsdb' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 1a9736ff9..af71e7880 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,34 @@ --- +- project: + name: ovsdb-aluminium + 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-jdk11 + - odl-maven-verify-jobs + + csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' + block_on_csit: false + + stream: aluminium + project: 'ovsdb' + project-name: 'ovsdb' + branch: 'master' + build-node: centos7-builder-2c-8g + java-version: 'openjdk11' + mvn-settings: 'ovsdb-settings' + mvn-opts: '-Xmx1024m' + 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-magnesium jobs: @@ -18,7 +48,7 @@ stream: magnesium project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/magnesium' build-node: centos7-builder-2c-8g java-version: 'openjdk11' mvn-settings: 'ovsdb-settings' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 13a0d1b5b..87732e3da 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,13 +1,13 @@ --- - project: - name: p4plugin-magnesium + name: p4plugin-aluminium jobs: - '{project-name}-maven-javadoc-jobs' - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'p4plugin' project-name: 'p4plugin' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a68bf26e208d4 +- project: + name: p4plugin-magnesium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'p4plugin' + project-name: 'p4plugin' + branch: 'stable/magnesium' + mvn-settings: 'p4plugin-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[p4plugin]' + + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-sodium jobs: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index eda597675..d1355abd3 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 346735aac..0997797ae 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,12 +1,12 @@ --- - project: - name: packetcable-magnesium + name: packetcable-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'packetcable' project-name: 'packetcable' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a68ca4a24655c +- project: + name: packetcable-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'packetcable' + project-name: 'packetcable' + branch: 'stable/magnesium' + mvn-settings: 'packetcable-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[packetcable]' + disable-job: true + + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-sodium jobs: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 2a592fdb8..00bd91e7c 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,16 +7,16 @@ project: 'serviceutils' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 953cc6941..c726ad13d 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-magnesium + name: serviceutils-aluminium jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' @@ -13,6 +13,39 @@ - odl-maven-verify-jobs branch: 'master' + stream: aluminium + + project: 'serviceutils' + project-name: 'serviceutils' + build-node: centos7-builder-2c-2g + java-version: 'openjdk11' + mvn-settings: 'serviceutils-settings' + mvn-opts: '-Xmx1024m' + build-timeout: 90 + dependencies: > + controller-merge-{stream}, + yangtools-merge-{stream}, + odlparent-merge-{stream}, + infrautils-merge-{stream} + email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]' + + # Used by the release job + staging-profile-id: 12cc4ba8bf01ba + +- project: + name: serviceutils-magnesium + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: serviceutils + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/ + rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4 + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + branch: 'stable/magnesium' stream: magnesium project: 'serviceutils' diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 3ffe3401d..4cfabd8a5 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index ecb62e765..6298d7fd0 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index f412d8026..e3734df41 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,16 +9,18 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' + java-version: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + + os-branch: 'queens' feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 6de3b14db..a4f2bcc1c 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'gerrit-tox-verify' stream: - - magnesium: + - aluminium: branch: 'master' + - magnesium: + branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 44356d434..c46aca90d 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,30 @@ --- +- project: + name: sfc-aluminium + jobs: + - '{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-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'sfc' + project-name: 'sfc' + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'sfc-settings' + mvn-opts: '-Xmx2048m -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-magnesium jobs: @@ -13,7 +39,7 @@ stream: magnesium project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/magnesium' java-version: 'openjdk11' mvn-settings: 'sfc-settings' mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 8dd08a140..14c91faf1 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,12 +1,12 @@ --- - project: - name: snmp-magnesium + name: snmp-aluminium jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'snmp' project-name: 'snmp' branch: 'master' @@ -18,6 +18,24 @@ # Used by the release job staging-profile-id: a68fb236b93a6 +- project: + name: snmp-magnesium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'snmp' + project-name: 'snmp' + branch: 'stable/magnesium' + mvn-settings: 'snmp-settings' + mvn-opts: '-Xmx1024m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[snmp] [odlparent]' + + # Used by the release job + staging-profile-id: a68fb236b93a6 + - project: name: snmp-sodium jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 03ed8de98..568bb9ba7 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,6 +1,6 @@ --- - project: - name: snmp4sdn-magnesium + name: snmp4sdn-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-verify-jobs - gerrit-release-merge - stream: magnesium + stream: aluminium project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'master' @@ -23,6 +23,29 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 +- project: + name: snmp4sdn-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: snmp4sdn + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/ + rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'snmp4sdn' + project-name: 'snmp4sdn' + branch: 'stable/magnesium' + mvn-settings: 'snmp4sdn-settings' + mvn-opts: '-Xmx1024m' + 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-sodium jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index ffbdeb981..e5a3f7d63 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index ee524c73f..93dcaa0db 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 09790fbad..4ab1a47e4 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 372822e6e..a15cf06fb 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 1fdebcbbd..cdbb10396 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index f9bebfe31..1ad7ab22c 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index b701b947b..1e74c4093 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 1bfd53102..14b655fc7 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,6 +1,6 @@ --- - project: - name: sxp-magnesium + name: sxp-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -13,7 +13,7 @@ java-version: 'openjdk11' - stream: magnesium + stream: aluminium project: 'sxp' project-name: 'sxp' branch: 'master' @@ -27,6 +27,33 @@ # Used by the release job staging-profile-id: a6909c75719b7 +- project: + name: sxp-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: sxp + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/ + rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d + - odl-maven-jobs + - odl-maven-verify-jobs + + java-version: 'openjdk11' + + stream: magnesium + project: 'sxp' + project-name: 'sxp' + branch: 'stable/magnesium' + + mvn-settings: 'sxp-settings' + mvn-opts: '-Xmx1024m' + + 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-sodium jobs: diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index cc17f29bc..0ac33f1ef 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 8c04f1cf4..7fd08fdf3 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,6 +1,6 @@ --- - project: - name: telemetry-magnesium + name: telemetry-aluminium jobs: - 'odl-maven-jobs' - odl-maven-verify-jobs @@ -12,7 +12,7 @@ rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb - gerrit-release-merge - stream: magnesium + stream: aluminium project: 'telemetry' project-name: 'telemetry' branch: 'master' @@ -25,6 +25,31 @@ # Used by the release job staging-profile-id: 8ed9c52266504 +- project: + name: telemetry-magnesium + jobs: + - 'odl-maven-jobs' + - odl-maven-verify-jobs + - '{project-name}-integration-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: telemetry + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/ + rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb + + stream: magnesium + project: 'telemetry' + project-name: 'telemetry' + branch: 'stable/magnesium' + mvn-settings: 'telemetry-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[telemetry]' + archive-artifacts: '' + + # Used by the release job + staging-profile-id: 8ed9c52266504 + - project: name: telemetry-sodium jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 46f8b7b30..f5fc50093 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,6 +1,6 @@ --- - project: - name: transportpce-magnesium + name: transportpce-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -16,7 +16,7 @@ project: 'transportpce' project-name: 'transportpce' - stream: magnesium + stream: aluminium branch: 'master' java-version: 'openjdk11' mvn-settings: 'transportpce-settings' @@ -27,6 +27,32 @@ # Used by the release job staging-profile-id: a6927323fa3d4 +- project: + name: transportpce-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: transportpce + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/ + rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd + - gerrit-tox-verify: + build-timeout: 120 + build-node: centos7-builder-8c-8g + - odl-maven-jobs + - odl-maven-verify-jobs + + project: 'transportpce' + project-name: 'transportpce' + stream: magnesium + branch: 'stable/magnesium' + mvn-settings: 'transportpce-settings' + mvn-opts: '-Xmx1024m' + 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-sodium jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 606978e65..a260f5fdd 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 5b9a83d86..c3c784012 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index f8687f553..b12efaa39 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 49f447c74..ebd5dda62 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 34e5d03cc..88b16cdd7 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,6 +1,6 @@ --- - project: - name: tsdr-magnesium + name: tsdr-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'tsdr' project-name: 'tsdr' branch: 'master' @@ -23,6 +23,29 @@ # Used by the release job staging-profile-id: a69373036303c +- project: + name: tsdr-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: tsdr + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/ + rtd-token: 96c97641155132afcc5900bafc68af3364d91c99 + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'tsdr' + project-name: 'tsdr' + branch: 'stable/magnesium' + mvn-settings: 'tsdr-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[tsdr]' + + # Used by the release job + staging-profile-id: a69373036303c + - project: name: tsdr-sodium jobs: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index f6ffac677..5ff0630b2 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,6 +1,6 @@ --- - project: - name: unimgr-magnesium + name: unimgr-aluminium jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'unimgr' project-name: 'unimgr' branch: 'master' @@ -24,6 +24,30 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 +- project: + name: unimgr-magnesium + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: unimgr + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/ + rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31 + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'unimgr' + project-name: 'unimgr' + branch: 'stable/magnesium' + mvn-settings: 'unimgr-settings' + mvn-opts: '-Xmx1024m' + 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-sodium jobs: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 1404bee7c..98b528163 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index e06973762..eddcf409e 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,13 +1,13 @@ --- - project: - name: usc-magnesium + name: usc-aluminium jobs: - '{project-name}-maven-javadoc-jobs' - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: magnesium + stream: aluminium project: 'usc' project-name: 'usc' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a697b633b3ffe +- project: + name: usc-magnesium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: magnesium + project: 'usc' + project-name: 'usc' + branch: 'stable/magnesium' + mvn-settings: 'usc-settings' + mvn-opts: '-Xmx1024m' + 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-sodium jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 0d6c51d54..7fd5210fb 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,9 +12,12 @@ # Project branches. stream: - - magnesium: + - aluminium: branch: 'master' jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - neon: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 01bb964f3..ddad34fdd 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,17 +7,18 @@ project: 'yangtools' stream: - - magnesium: + - aluminium: branch: 'master' - os-branch: 'queens' - java-version: 'openjdk11' + jre: 'openjdk11' + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' - sodium: branch: 'stable/sodium' - os-branch: 'queens' - neon: branch: 'stable/neon' - os-branch: 'queens' + os-branch: 'queens' jdk: 'openjdk8' feature: -- 2.36.6