From 0abaee571f249a9da5396f5d44cae9350f2fbf2a Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 5 Aug 2020 13:36:05 -0400 Subject: [PATCH] Branch cut for stable/aluminium stream Change-Id: I7f671d7ec40e322a06bdffb838c51d72bc8f5c4b Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 5 +- jjb/aaa/aaa-patch-test.yaml | 5 +- jjb/aaa/aaa.yaml | 27 +++++++- jjb/alt-datastores/alt-datastores.yaml | 28 ++++++++- jjb/ansible/ansible.yaml | 4 +- jjb/archetypes/archetypes.yaml | 20 +++++- .../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 | 5 +- jjb/daexim/daexim-csit-basic.yaml | 5 +- jjb/daexim/daexim-csit-clustering-basic.yaml | 5 +- jjb/daexim/daexim.yaml | 27 +++++++- jjb/defaults.yaml | 22 +++++++ 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 | 5 +- 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/infrautils/infrautils-patch-test.yaml | 5 +- jjb/integration/csit-jobs-silicon.lst | 63 +++++++++++++++++++ .../distribution-csit-userfeatures.yaml | 5 +- .../distribution/distribution-jobs.yaml | 33 +++++++++- jjb/integration/integration-test-jobs.yaml | 36 ++++++++++- 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 | 5 +- jjb/l2switch/l2switch.yaml | 28 ++++++++- .../lispflowmapping-csit-msmr.yaml | 5 +- jjb/lispflowmapping/lispflowmapping.yaml | 34 +++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 +- jjb/mdsal/mdsal-patch-test.yaml | 5 +- 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 | 5 +- 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 +- jjb/netvirt/netvirt-patch-test.yaml | 5 +- jjb/netvirt/netvirt.yaml | 42 ++++++++++++- jjb/neutron/neutron-patch-test.yaml | 4 +- jjb/neutron/neutron.yaml | 24 ++++++- jjb/odlguice/odlguice.yaml | 24 ++++++- jjb/odlmicro/odlmicro.yaml | 23 ++++++- jjb/odlparent/odlparent-patch-test.yaml | 4 +- jjb/odlsaf/odlsaf.yaml | 24 ++++++- 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 | 6 +- .../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 | 5 +- 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 | 5 +- 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 | 4 +- 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 | 5 +- 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 | 31 ++++++++- 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 | 33 +++++++++- 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 | 5 +- 142 files changed, 1511 insertions(+), 166 deletions(-) create mode 100644 jjb/integration/csit-jobs-silicon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index f4a417c623..375a230f8c 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index ccb1976424..7ef5631690 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: 'aaa' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index e13c590b96..53486d225c 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,29 @@ --- +- project: + name: aaa-silicon + 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: silicon + 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-aluminium jobs: @@ -14,7 +39,7 @@ stream: aluminium project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/aluminium' 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 9b838a189c..a6b3c5a39d 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -1,6 +1,6 @@ --- - project: - name: alt-datastores-aluminium + name: alt-datastores-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon 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-aluminium + 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: aluminium + project: 'alt-datastores' + project-name: 'alt-datastores' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index 701f76ec3b..dfc2124af6 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -9,8 +9,10 @@ - odl-maven-verify-jobs stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 5480703c15..afb8f95631 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,22 @@ --- +- project: + name: archetypes-silicon + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: silicon + project: 'archetypes' + project-name: 'archetypes' + branch: 'master' + 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-aluminium jobs: @@ -8,7 +26,7 @@ stream: aluminium project: 'archetypes' project-name: 'archetypes' - branch: 'master' + branch: 'stable/aluminium' java-version: 'openjdk11' mvn-settings: 'archetypes-settings' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 88efcc96ac..29a773b3d6 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: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 244f96fcb4..17a5249c6e 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index ced3840dff..f54addec5a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 15d27ff909..31d825701b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 2a9cad380a..404eb9848a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index dd2cfa62c6..eb87a1c2d7 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 6576c79a95..de5e1fa7c0 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index f452b88f97..a2f3197fc3 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index fd8753ba35..211b599791 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 65ba233399..2b5773e3cd 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,36 @@ --- +- project: + name: bgpcep-silicon + 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: silicon + 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-aluminium jobs: @@ -17,7 +49,7 @@ project-name: 'bgpcep' build-node: centos7-builder-8c-8g build-timeout: 120 - branch: 'master' + branch: 'stable/aluminium' 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 6ed2d87b41..965b693630 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 9a4f47ecc3..cfe9b4e342 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,12 +1,12 @@ --- - project: - name: bier-aluminium + name: bier-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'bier' project-name: 'bier' branch: 'master' @@ -21,6 +21,27 @@ # Used by the release job staging-profile-id: 942a8075b1f2a +- project: + name: bier-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'bier' + project-name: 'bier' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 25a1cf6117..37fc2fbd15 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,29 @@ --- +- project: + name: coe-silicon + 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: silicon + 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-aluminium jobs: @@ -13,7 +38,7 @@ project: 'coe' project-name: 'coe' stream: aluminium - branch: 'master' + branch: 'stable/aluminium' 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 c95eb3a53e..71769193b5 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ functionality: 'akka1' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 957775a9ef..9fb0e7d6b6 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ elasticsearch-attribute: 'disabled' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 4d2aba33e2..dc7dbbc5cf 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 726bc99953..a2ffdf314b 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index e3470f6d49..c153a214af 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 8478e19fa6..fa781a2489 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 233f2b7114..08321c9765 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 45d12958a2..bebcd32060 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index ddf01235fa..6554f15083 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 0fe0026ff4..bb3bc292af 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index ed408a3198..1bd14cd1b4 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 6078eed663..f97af95af4 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 8e44441bed..d443e919b7 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: 'controller' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 1bab2dc615..577cd224f5 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 81e3800d70..eef4b47dc4 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 77abd1a756..fae0e5c14d 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-silicon + 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: silicon + 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-aluminium jobs: @@ -14,7 +39,7 @@ project: 'daexim' project-name: 'daexim' stream: aluminium - branch: 'master' + branch: 'stable/aluminium' java-version: 'openjdk11' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 0f8758bee8..a328195fc3 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -188,6 +188,16 @@ 10-exclude-value: '' # Manual CSIT job lists used by sanity or periodic in nature. + csit-mri-list-silicon: > + controller-csit-1node-akka1-all-silicon, + controller-csit-1node-benchmark-all-silicon, + controller-csit-1node-rest-cars-perf-all-silicon, + controller-csit-3node-benchmark-all-silicon, + controller-csit-3node-clustering-ask-all-silicon, + controller-csit-3node-clustering-tell-all-silicon, + controller-csit-3node-rest-clust-cars-perf-ask-only-silicon, + controller-csit-3node-rest-clust-cars-perf-tell-only-silicon, + yangtools-csit-1node-system-only-silicon csit-mri-list-aluminium: > controller-csit-1node-akka1-all-aluminium, controller-csit-1node-benchmark-all-aluminium, @@ -202,6 +212,9 @@ yangtools-csit-1node-system-only-magnesium csit-mri-list-sodium: > yangtools-csit-1node-system-only-sodium + csit-sanity-list-silicon: > + openflowplugin-csit-1node-sanity-only-silicon, + distribution-sanity-silicon csit-sanity-list-aluminium: > openflowplugin-csit-1node-sanity-only-aluminium, distribution-sanity-aluminium @@ -211,6 +224,15 @@ csit-sanity-list-sodium: > openflowplugin-csit-1node-sanity-only-sodium, distribution-sanity-sodium + csit-weekly-list-silicon: > + controller-csit-1node-notifications-longevity-only-silicon, + controller-csit-3node-drb-partnheal-longevity-only-silicon, + controller-csit-3node-drb-precedence-longevity-only-silicon, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon, + bgpcep-csit-3node-bgpclustering-longevity-only-silicon, + distribution-deploy-silicon, + distribution-offline-silicon, + openflowplugin-csit-1node-longevity-only-silicon csit-weekly-list-aluminium: > controller-csit-1node-notifications-longevity-only-aluminium, controller-csit-3node-drb-partnheal-longevity-only-aluminium, diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 68d68e7886..3ccc98e059 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -1,6 +1,6 @@ --- - project: - name: detnet-aluminium + name: detnet-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'detnet' project-name: 'detnet' branch: 'master' @@ -25,6 +25,31 @@ # Used by the release job staging-profile-id: 8981976d0fea7 +- project: + name: detnet-aluminium + 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: aluminium + project: 'detnet' + project-name: 'detnet' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index e4e898f7e3..ba6e33cb3f 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 5fe9eee190..d956656529 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,6 +1,6 @@ --- - project: - name: dluxapps-aluminium + name: dluxapps-silicon jobs: - gerrit-release-merge - odl-maven-jobs @@ -8,7 +8,7 @@ project: 'dluxapps' project-name: 'dluxapps' - stream: aluminium + stream: silicon 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-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + project: 'dluxapps' + project-name: 'dluxapps' + stream: aluminium + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index fd9faf1b08..f38dae0fdf 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 43ff1abc3c..46bdaec6c5 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -16,9 +16,12 @@ testplan: '{project}-{functionality}.txt' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 22019011bc..7cd7e09b55 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,9 +7,12 @@ project: 'genius' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 0a5084ddd2..fef37c5d75 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,40 @@ --- +- project: + name: genius-silicon + 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: silicon + 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-aluminium jobs: @@ -18,7 +54,7 @@ stream: aluminium project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/aluminium' 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 5145980d96..13c242ea5c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -20,9 +20,12 @@ functionality: 'openstack' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 65bf712809..d84f74ae8b 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index eb92ba31ce..de96bd6853 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 3371ae968c..2738d89ba0 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index c0fcd16314..0c9a9052e4 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index c33f97ebf9..4dbf8ada17 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,12 +1,12 @@ --- - project: - name: groupbasedpolicy-aluminium + name: groupbasedpolicy-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' @@ -27,6 +27,33 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 +- project: + name: groupbasedpolicy-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'groupbasedpolicy' + project-name: 'groupbasedpolicy' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index c185bf1267..638b1621d8 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: 'infrautils' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst new file mode 100644 index 0000000000..c2f3477519 --- /dev/null +++ b/jjb/integration/csit-jobs-silicon.lst @@ -0,0 +1,63 @@ +aaa-csit-1node-authn-all-silicon, +bgpcep-csit-1node-bgp-ingest-all-silicon, +bgpcep-csit-1node-bgp-ingest-mixed-all-silicon, +bgpcep-csit-1node-throughpcep-all-silicon, +bgpcep-csit-1node-userfeatures-all-silicon, +daexim-csit-1node-basic-only-silicon, +daexim-csit-3node-clustering-basic-only-silicon, +distribution-csit-1node-userfeatures-all-silicon, +distribution-csit-managed-silicon, +genius-csit-1node-upstream-only-silicon, +genius-csit-3node-upstream-only-silicon, +jsonrpc-csit-1node-basic-only-silicon, +lispflowmapping-csit-1node-msmr-all-silicon, +lispflowmapping-csit-3node-msmr-all-silicon, +netconf-csit-1node-callhome-only-silicon, +netconf-csit-1node-scale-max-devices-only-silicon, +netconf-csit-1node-scale-only-silicon, +netconf-csit-1node-userfeatures-all-silicon, +netconf-csit-1node-userfeatures-rfc8040-all-silicon, +netconf-csit-3node-clustering-only-silicon, +netconf-csit-3node-clustering-scale-only-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-silicon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-silicon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon, +odltools-csit-1node-upstream-all-silicon, +openflowplugin-csit-1node-cbench-only-silicon, +openflowplugin-csit-1node-flow-services-all-silicon, +openflowplugin-csit-1node-perf-bulkomatic-only-silicon, +openflowplugin-csit-1node-perf-stats-collection-only-silicon, +openflowplugin-csit-1node-scale-link-only-silicon, +openflowplugin-csit-1node-scale-only-silicon, +openflowplugin-csit-1node-scale-switch-only-silicon, +openflowplugin-csit-3node-clustering-bulkomatic-only-silicon, +openflowplugin-csit-3node-clustering-only-silicon, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-silicon, +ovsdb-csit-1node-upstream-southbound-all-silicon, +ovsdb-csit-3node-upstream-clustering-only-silicon, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index e90c66301e..9e7d9e6fcc 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 36dd6ba9bf..b099fbea43 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -21,10 +21,14 @@ nexus-iq-stage: release email-upstream: '[int/dist]' stream: - - aluminium: + - silicon: branch: 'master' java-version: openjdk11 jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: openjdk11 + jre: 'openjdk11' karaf-version: odl - magnesium: branch: 'stable/magnesium' @@ -64,7 +68,7 @@ dist-pom: 'distribution/pom.xml' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' jre: 'openjdk11' @@ -81,6 +85,23 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' + jre: 'openjdk11' + dependencies: > + aaa-maven-merge-{stream}, + bgpcep-maven-merge-{stream}, + daexim-maven-merge-{stream}, + genius-maven-merge-{stream}, + jsonrpc-maven-merge-{stream}, + lispflowmapping-maven-merge-{stream}, + netconf-maven-merge-{stream}, + netvirt-maven-merge-{stream} + neutron-maven-merge-{stream}, + openflowplugin-maven-merge-{stream}, + ovsdb-maven-merge-{stream}, + serviceutils-maven-merge-{stream}, - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' @@ -140,12 +161,18 @@ dist-pom: 'distribution/opendaylight/pom.xml' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' karaf-version: odl dependencies: > distribution-merge-managed-{stream}, + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' + karaf-version: odl + dependencies: > + distribution-merge-managed-{stream}, - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index d5fca6febd..707b0a7ee9 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -19,10 +19,20 @@ # CSIT Lists in defaults.yaml stream: - - aluminium: + - silicon: branch: 'master' mvn-version: 'mvn35' java-version: 'openjdk11' + csit-list: !include: csit-jobs-silicon.lst + build-order: > + odlparent yangtools mdsal controller infrautils serviceutils aaa netconf + daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt + bgpcep integration/distribution + + - aluminium: + branch: 'stable/aluminium' + mvn-version: 'mvn35' + java-version: 'openjdk11' csit-list: !include: csit-jobs-aluminium.lst build-order: > odlparent yangtools mdsal controller infrautils serviceutils aaa netconf @@ -60,8 +70,24 @@ # CSIT Lists in defaults.yaml stream: - - aluminium: + - silicon: branch: 'master' + csit-blocklist: > + alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal + nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools + gate longevity sanity tdd tempest wip + bgpcep-csit-3node-bgpclustering-all + bgpcep-csit-3node-bgpclustering-ha-only + netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike + netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct + netvirt-csit-3node-1cmb + openflowplugin-csit-1node-bundle-based-reconciliation + last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used + csit-list: !include: csit-jobs-silicon.lst + csit-mri-list: '{csit-mri-list-silicon}' + csit-weekly-list: '{csit-weekly-list-silicon}' + - aluminium: + branch: 'stable/aluminium' csit-blocklist: > alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools @@ -117,10 +143,14 @@ - 'integration-sanity-test-{stream}' stream: - - aluminium: + - silicon: branch: 'master' karaf-version: odl csit-sanity-list: '{csit-sanity-list-aluminium}' + - aluminium: + branch: 'stable/aluminium' + karaf-version: odl + csit-sanity-list: '{csit-sanity-list-aluminium}' - magnesium: branch: 'stable/magnesium' karaf-version: odl diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index a29ce98353..9a1b2a90cc 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 6bdd54d834..6ad41ede1e 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,6 +1,6 @@ --- - project: - name: jsonrpc-aluminium + name: jsonrpc-silicon jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-rtd-jobs': @@ -14,7 +14,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' - stream: aluminium + stream: silicon 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-aluminium + 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: aluminium + java-version: 'openjdk11' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index a2ccbb1052..1c93e8befd 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index a35111d361..115c182a7a 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 23ab9c4c2e..78101db98f 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 268b6223c3..6172f0defe 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 16be7f055b..c2d8515483 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,12 +1,12 @@ --- - project: - name: l2switch-aluminium + name: l2switch-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'l2switch' project-name: 'l2switch' branch: 'master' @@ -24,6 +24,30 @@ # Used by the release job staging-profile-id: 96fee85953ca0 +- project: + name: l2switch-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'l2switch' + project-name: 'l2switch' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 3df1c63d25..98f5676837 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 82ae84fdb6..dfb3aca6b6 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,36 @@ --- +- project: + name: lispflowmapping-silicon + 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: silicon + 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-aluminium jobs: @@ -15,7 +47,7 @@ stream: aluminium project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/aluminium' 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 d34691fc6a..26df6112f7 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ functionality: 'bindingv1' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 57fc332f2b..02ad831068 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: 'mdsal' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index b68471a95a..382b9d427c 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 6e19ad099a..fe2d96d3d7 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,12 +1,12 @@ --- - project: - name: nemo-aluminium + name: nemo-silicon jobs: - odl-maven-jobs - odl-maven-verify-jobs - gerrit-release-merge - stream: aluminium + stream: silicon project: 'nemo' project-name: 'nemo' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a67a9890f6202 +- project: + name: nemo-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'nemo' + project-name: 'nemo' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 7c54ff96db..66126e65ec 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index f55ef62a4c..a4c2f7e809 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 0e0352f2e3..abe038662a 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 14cff7d78c..b015ade27d 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netconf' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 3c3b69af81..da64790362 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index bc82b82130..93457d0b21 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -18,9 +18,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 5a79625e23..c456cb6640 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,32 @@ --- +- project: + name: netconf-silicon + 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: silicon + 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-aluminium jobs: @@ -14,7 +42,7 @@ stream: aluminium project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/aluminium' 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 075701fae3..3069a4da09 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -8,9 +8,12 @@ project: 'netvirt' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 50499ed92b..78bcead954 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: 'netvirt' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index c132094708..11ee0f7c2b 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -1,4 +1,44 @@ --- +- project: + name: netvirt-silicon + 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: silicon + 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-aluminium jobs: @@ -18,7 +58,7 @@ block_on_csit: false stream: aluminium - branch: 'master' + branch: 'stable/aluminium' project: 'netvirt' project-name: 'netvirt' diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 18180a94a2..c0512be767 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,8 +7,10 @@ project: 'neutron' stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index e64a81554a..b6d3dc8384 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,26 @@ --- +- project: + name: neutron-silicon + jobs: + - '{project-name}-distribution-check-{stream}' + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: silicon + 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-aluminium jobs: @@ -11,7 +33,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 90 - branch: 'master' + branch: 'stable/aluminium' java-version: 'openjdk11' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m' diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml index 795a2ee10d..0764fe445f 100644 --- a/jjb/odlguice/odlguice.yaml +++ b/jjb/odlguice/odlguice.yaml @@ -1,12 +1,12 @@ --- - project: - name: odlguice-aluminium + name: odlguice-silicon jobs: - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'odlguice' project-name: 'odlguice' build-node: centos7-builder-2c-2g @@ -20,6 +20,26 @@ # Used by the release job staging-profile-id: 44ce7d1aad49e +- project: + name: odlguice-aluminium + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'odlguice' + project-name: 'odlguice' + build-node: centos7-builder-2c-2g + build-timeout: 120 + branch: 'stable/aluminium' + java-version: 'openjdk11' + mvn-settings: 'odlguice-settings' + mvn-opts: '-Xmx2048m' + email-upstream: '[app-dev]' + + # Used by the release job + staging-profile-id: 44ce7d1aad49e + - project: name: odlguice-info jobs: diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index cd3d3f8c64..a7dcc8d423 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -1,12 +1,12 @@ --- - project: - name: odlmicro-aluminium + name: odlmicro-silicon jobs: - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: odlmicro project-name: 'odlmicro' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: 44ce67428fd0d +- project: + name: odlmicro-aluminium + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: odlmicro + project-name: 'odlmicro' + branch: 'stable/aluminium' + java-version: 'openjdk11' + build-node: centos7-builder-2c-2g + build-timeout: 60 + mvn-settings: 'odlmicro-settings' + mvn-opts: '-Xmx2048m' + + # Used by the release job + staging-profile-id: 44ce67428fd0d + - project: name: odlmicro-info jobs: diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 0141f7801b..d5e40bee2f 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,8 +7,10 @@ project: 'odlparent' stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index eea06da079..e03ad84038 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -1,12 +1,12 @@ --- - project: - name: odlsaf-aluminium + name: odlsaf-silicon jobs: - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'odlsaf' project-name: 'odlsaf' build-node: centos7-builder-2c-2g @@ -20,6 +20,26 @@ # Used by the release job staging-profile-id: 2802f0e38ee665 +- project: + name: odlsaf-aluminium + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'odlsaf' + project-name: 'odlsaf' + build-node: centos7-builder-2c-2g + build-timeout: 120 + branch: 'stable/aluminium' + java-version: 'openjdk11' + mvn-settings: 'odlsaf-settings' + mvn-opts: '-Xmx2048m' + email-upstream: '[app-dev]' + + # Used by the release job + staging-profile-id: 2802f0e38ee665 + - project: name: odlsaf-info jobs: diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index a84a280e6b..ae939f582a 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,9 +10,12 @@ testplan: '{project}-basic.txt' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index c3503a955b..a7feb59969 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 2a9b7e9e68..b56e22d757 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -12,8 +12,10 @@ rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2 stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 33d38c7ea2..de61c43c9d 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,12 +1,12 @@ --- - project: - name: of-config-aluminium + name: of-config-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon 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-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'of-config' + project-name: 'of-config' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 78ea0e4841..c271130d90 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 8b561ce744..cd25e53e1d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 0402ba372e..fc05d50777 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 25dec7c051..fe9523583c 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 77c1625682..219b574053 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index e30af69f46..926c68c039 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,10 +14,14 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' install: 'all' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' + install: 'all' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 5b2cb7e5d1..4a812b25e9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -16,9 +16,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 7c344d5fea..5ce4c53197 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 84262cb005..5b4ee0390b 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: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index d814d36c33..cd47ff9f5c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index ad11f1526a..7bce1be24f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index ef5e744ff9..5f30702886 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 066510af2a..8ad83c4470 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index d5d2ecac13..9b4ddce745 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index afd677a1c3..f09216bf9c 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,41 @@ --- +- project: + name: openflowplugin-silicon + 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: silicon + 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-aluminium jobs: @@ -19,7 +56,7 @@ stream: aluminium project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/aluminium' 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 3d6531ae56..8334a7a249 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - aluminium: + - silicon: branch: 'master' libuv-version: '1.20.2' rapidjson-version: '1.1.0' openvswitch-version: '2.12.0' + - aluminium: + branch: 'stable/aluminium' + libuv-version: '1.20.2' + rapidjson-version: '1.1.0' + openvswitch-version: '2.12.0' - magnesium: branch: 'stable/magnesium' libuv-version: '1.20.2' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index d273f3953d..47c1cae387 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -10,11 +10,16 @@ - 'opflex-release-{stream}' stream: - - aluminium: + - silicon: branch: 'master' libuv-version: '1.20.2' rapidjson-version: '1.1.0' openvswitch-version: '2.12.0' + - aluminium: + branch: 'stable/aluminium' + libuv-version: '1.20.2' + rapidjson-version: '1.1.0' + openvswitch-version: '2.12.0' - magnesium: branch: 'stable/magnesium' libuv-version: '1.20.2' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 046a98406d..7c9348a681 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 22e0e8ae8f..2ffcb9a073 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index dc40a19352..cc641eda9b 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,9 +5,12 @@ - 'ovsdb-daily-full-integration-{stream}' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index c52b34d364..eb487d5602 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: 'ovsdb' stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index af2ec28f0f..02f8c80178 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,34 @@ --- +- project: + name: ovsdb-silicon + 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: silicon + 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-aluminium jobs: @@ -18,7 +48,7 @@ stream: aluminium project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/aluminium' 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 ae8f46da7a..829a7caf04 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,13 +1,13 @@ --- - project: - name: p4plugin-aluminium + name: p4plugin-silicon jobs: - '{project-name}-maven-javadoc-jobs' - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'p4plugin' project-name: 'p4plugin' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a68bf26e208d4 +- project: + name: p4plugin-aluminium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'p4plugin' + project-name: 'p4plugin' + branch: 'stable/aluminium' + mvn-settings: 'p4plugin-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[p4plugin]' + + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-magnesium jobs: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index dd794b7fdd..f6e9aee3bd 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 5d9f5fabc1..1425f73b3b 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,12 +1,12 @@ --- - project: - name: packetcable-aluminium + name: packetcable-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'packetcable' project-name: 'packetcable' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a68ca4a24655c +- project: + name: packetcable-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'packetcable' + project-name: 'packetcable' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 2397c85dfe..bf8efaf164 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,8 +7,10 @@ project: 'serviceutils' stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 0a9cbf91d7..4c9d5db13e 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-aluminium + name: serviceutils-silicon jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' @@ -13,6 +13,39 @@ - odl-maven-verify-jobs branch: 'master' + stream: silicon + + 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-aluminium + 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/aluminium' stream: aluminium project: 'serviceutils' diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 5bbfbdcba3..8b01c9b144 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 80d389143b..09f9827194 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 42f334eb60..1d7ef2c943 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' java-version: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + java-version: 'openjdk11' - magnesium: branch: 'stable/magnesium' java-version: 'openjdk11' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index bd0daa5a17..9afaad5ff1 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - 'gerrit-tox-verify' stream: - - aluminium: + - silicon: branch: 'master' + - aluminium: + branch: 'stable/aluminium' - magnesium: branch: 'stable/magnesium' - sodium: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 2e46db2a40..9be59825c8 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,30 @@ --- +- project: + name: sfc-silicon + 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: silicon + 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-aluminium jobs: @@ -13,7 +39,7 @@ stream: aluminium project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/aluminium' 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 7193d27c3a..9061d10fea 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,12 +1,12 @@ --- - project: - name: snmp-aluminium + name: snmp-silicon jobs: - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'snmp' project-name: 'snmp' branch: 'master' @@ -18,6 +18,24 @@ # Used by the release job staging-profile-id: a68fb236b93a6 +- project: + name: snmp-aluminium + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'snmp' + project-name: 'snmp' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 9ad5b64de1..fdfb44a895 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,6 +1,6 @@ --- - project: - name: snmp4sdn-aluminium + name: snmp4sdn-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-verify-jobs - gerrit-release-merge - stream: aluminium + stream: silicon project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'master' @@ -23,6 +23,29 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 +- project: + name: snmp4sdn-aluminium + 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: aluminium + project: 'snmp4sdn' + project-name: 'snmp4sdn' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 28b1270e37..b32a4547ab 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index d6c9a4ff32..f83cbc2081 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 52d70be191..7d29eddd37 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 7fc4308178..e1f013fa5c 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index a83f648eef..a71eab0c11 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 4af044b963..0369090902 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 443585b0c6..9951cb619e 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index ba2b58e15e..6551f89ab3 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,6 +1,6 @@ --- - project: - name: sxp-aluminium + name: sxp-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -13,7 +13,7 @@ java-version: 'openjdk11' - stream: aluminium + stream: silicon project: 'sxp' project-name: 'sxp' branch: 'master' @@ -27,6 +27,33 @@ # Used by the release job staging-profile-id: a6909c75719b7 +- project: + name: sxp-aluminium + 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: aluminium + project: 'sxp' + project-name: 'sxp' + branch: 'stable/aluminium' + + 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-magnesium jobs: diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index af637e1d68..1a02333063 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 00533d7f8d..5405f9b861 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,6 +1,6 @@ --- - project: - name: telemetry-aluminium + name: telemetry-silicon jobs: - 'odl-maven-jobs' - odl-maven-verify-jobs @@ -12,7 +12,7 @@ rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb - gerrit-release-merge - stream: aluminium + stream: silicon project: 'telemetry' project-name: 'telemetry' branch: 'master' @@ -25,6 +25,31 @@ # Used by the release job staging-profile-id: 8ed9c52266504 +- project: + name: telemetry-aluminium + 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: aluminium + project: 'telemetry' + project-name: 'telemetry' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index ec52b9fafe..c9bbf54bc7 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,6 +1,6 @@ --- - project: - name: transportpce-aluminium + name: transportpce-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -16,7 +16,7 @@ project: 'transportpce' project-name: 'transportpce' - stream: aluminium + stream: silicon branch: 'master' java-version: 'openjdk11' mvn-settings: 'transportpce-settings' @@ -27,6 +27,33 @@ # Used by the release job staging-profile-id: a6927323fa3d4 +- project: + name: transportpce-aluminium + 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-4c-16g + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: 'transportpce' + project-name: 'transportpce' + stream: aluminium + branch: 'stable/aluminium' + java-version: 'openjdk11' + 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-magnesium jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index c1df5fbcdc..a793df832b 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 6e4de655e9..88bb35d488 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index d7b38c30b9..2f3d557835 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index a58b1ba6b9..dd606fafcf 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 7d44c4ea5e..82391f9197 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,6 +1,6 @@ --- - project: - name: tsdr-aluminium + name: tsdr-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'tsdr' project-name: 'tsdr' branch: 'master' @@ -23,6 +23,29 @@ # Used by the release job staging-profile-id: a69373036303c +- project: + name: tsdr-aluminium + 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: aluminium + project: 'tsdr' + project-name: 'tsdr' + branch: 'stable/aluminium' + mvn-settings: 'tsdr-settings' + mvn-opts: '-Xmx1024m' + dependencies: '' + email-upstream: '[tsdr]' + + # Used by the release job + staging-profile-id: a69373036303c + - project: name: tsdr-magnesium jobs: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 1c3d350778..2fccbd4cfd 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,6 +1,6 @@ --- - project: - name: unimgr-aluminium + name: unimgr-silicon jobs: - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -11,7 +11,7 @@ - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'unimgr' project-name: 'unimgr' branch: 'master' @@ -29,6 +29,35 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 +- project: + name: unimgr-aluminium + 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: aluminium + project: 'unimgr' + project-name: 'unimgr' + branch: 'stable/aluminium' + java-version: 'openjdk11' + mvn-settings: 'unimgr-settings' + mvn-opts: '-Xmx1024m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream} + email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]' + build-node: centos7-builder-4c-16g + + # Used by the release job + staging-profile-id: a695d0a0b8d51 + - project: name: unimgr-magnesium jobs: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 2f2b42e46b..7ca1cbfc59 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 9a93d7571a..7a344f3a06 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,13 +1,13 @@ --- - project: - name: usc-aluminium + name: usc-silicon jobs: - '{project-name}-maven-javadoc-jobs' - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs - stream: aluminium + stream: silicon project: 'usc' project-name: 'usc' branch: 'master' @@ -19,6 +19,25 @@ # Used by the release job staging-profile-id: a697b633b3ffe +- project: + name: usc-aluminium + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: aluminium + project: 'usc' + project-name: 'usc' + branch: 'stable/aluminium' + 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-magnesium jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 202c028d83..b8a8061a06 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,9 +12,12 @@ # Project branches. stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index a9808ef690..43718d58bf 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: 'yangtools' stream: - - aluminium: + - silicon: branch: 'master' jre: 'openjdk11' + - aluminium: + branch: 'stable/aluminium' + jre: 'openjdk11' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' -- 2.36.6