From d7f0089a47322c5028ad3cc3c71c52ecd1443139 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 23 Feb 2021 12:13:26 +1000 Subject: [PATCH] Branch cut for stable/silicon stream master is moved to next release (phosphorus). Issue: https://jira.linuxfoundation.org/browse/IT-21581 Change-Id: Ic801cace3c3a06c0f27599be9a1931e6cdc92596 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 5 +- jjb/aaa/aaa-patch-test.yaml | 5 +- jjb/alt-datastores/alt-datastores.yaml | 26 +++++++++- jjb/archetypes/archetypes.yaml | 20 ++++++- jjb/autorelease/autorelease-projects.yaml | 5 +- .../autorelease-version-management.yaml | 4 +- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 5 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 7 ++- 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 | 23 +++++++- 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 | 23 ++++++++ jjb/detnet/detnet.yaml | 27 +++++++++- jjb/dluxapps/dluxapps-csit-yangman.yaml | 5 +- jjb/dluxapps/dluxapps.yaml | 22 +++++++- jjb/docs/docs-rtd.yaml | 4 +- jjb/genius/genius-csit-genius.yaml | 5 +- jjb/genius/genius-patch-test.yaml | 5 +- jjb/genius/genius.yaml | 48 +++++++++++++++-- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 43 +++++++++++++-- jjb/infrautils/infrautils-patch-test.yaml | 5 +- jjb/integration/csit-jobs-phosphorus.lst | 33 ++++++++++++ jjb/integration/integration-test-jobs.yaml | 39 +++++++++++--- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 5 +- jjb/jsonrpc/jsonrpc.yaml | 27 +++++++++- .../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 | 36 +++++++++++-- .../lispflowmapping-csit-msmr.yaml | 5 +- jjb/lispflowmapping/lispflowmapping.yaml | 34 +++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 +- jjb/mdsal/mdsal-csit-netty-replication.yaml | 5 +- jjb/mdsal/mdsal-patch-test.yaml | 5 +- jjb/nemo/nemo-csit-engine.yaml | 5 +- jjb/nemo/nemo.yaml | 21 +++++++- 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 | 32 ++++++++---- jjb/netconf/netconf-userfeatures.yaml | 5 +- .../netvirt-csit-multi-openstack-upgrade.yaml | 6 ++- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 22 ++++---- jjb/netvirt/netvirt-patch-test.yaml | 5 +- jjb/netvirt/netvirt.yaml | 52 +++++++++++++++++-- jjb/neutron/neutron-patch-test.yaml | 4 +- jjb/neutron/neutron.yaml | 24 ++++++++- jjb/odlmicro/odlmicro-csit.yaml | 38 ++++++++++++-- jjb/odlmicro/odlmicro.yaml | 21 +++++++- jjb/odlparent/odlparent-patch-test.yaml | 4 +- jjb/odlsaf/odlsaf.yaml | 22 +++++++- jjb/odltools/odltools-csit.yaml | 5 +- jjb/odltools/odltools-patch-test.yaml | 4 +- jjb/of-config/of-config.yaml | 21 +++++++- ...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 | 36 ++++++++++++- jjb/opflex/opflex-custom.yaml | 37 ++++++++----- 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 | 29 ++++++++++- jjb/p4plugin/p4plugin.yaml | 21 +++++++- jjb/packetcable/packetcable-csit-pcmm.yaml | 5 +- jjb/packetcable/packetcable.yaml | 21 +++++++- 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 | 20 ++++++- jjb/snmp4sdn/snmp4sdn.yaml | 25 ++++++++- 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 | 29 ++++++++++- jjb/telemetry/telemetry-csit-basic.yaml | 5 +- jjb/telemetry/telemetry.yaml | 27 +++++++++- jjb/transportpce/transportpce.yaml | 29 ++++++++++- 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 | 25 ++++++++- jjb/unimgr/unimgr.yaml | 31 ++++++++++- jjb/usc/usc-csit-tcp.yaml | 5 +- jjb/usc/usc.yaml | 21 +++++++- jjb/yangtools/yangtools-csit-system.yaml | 5 +- jjb/yangtools/yangtools-patch-test.yaml | 5 +- 133 files changed, 1438 insertions(+), 180 deletions(-) create mode 100644 jjb/integration/csit-jobs-phosphorus.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 73c4d663e..0a771869f 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index cb9f2a911..c5156f1fd 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: "aaa" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index 272684335..638748d45 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -1,4 +1,28 @@ --- +- project: + name: alt-datastores-phosphorus + 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: phosphorus + project: "alt-datastores" + project-name: "alt-datastores" + branch: "master" + 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-silicon jobs: @@ -13,7 +37,7 @@ stream: silicon project: "alt-datastores" project-name: "alt-datastores" - branch: "master" + branch: "stable/silicon" mvn-settings: "alt-datastores-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index b27c809a2..f2e0cfc21 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,22 @@ --- +- project: + name: archetypes-phosphorus + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: phosphorus + 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-silicon jobs: @@ -8,7 +26,7 @@ stream: silicon project: "archetypes" project-name: "archetypes" - branch: "master" + branch: "stable/silicon" 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-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 7b820293c..65a4c9f74 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -13,9 +13,12 @@ - gerrit-tox-verify stream: - - silicon: + - phosphorus: branch: "master" integration-test: silicon + - silicon: + branch: "stable/silicon" + integration-test: silicon - aluminium: branch: "stable/aluminium" integration-test: aluminium diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 1672c402c..000aa2fe8 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: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 1c2b4594c..03f5e8120 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index a35454904..7b08a5612 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -3,7 +3,7 @@ name: bgpcep-csit-bgp-ingest jobs: - inttest-csit-1node - # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition. + # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition. # The project name project: "bgpcep" @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 876dc6350..4fba92afd 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 05595801c..395663e02 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index d0952e986..bf6a5f179 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index aa6b5cba4..6495486cf 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 247e94d53..0e76879dd 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 66655a6d1..6fb08d460 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 81bbf7047..0639290df 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,36 @@ --- +- project: + name: bgpcep-phosphorus + 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: phosphorus + 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-silicon jobs: @@ -17,7 +49,7 @@ project-name: "bgpcep" build-node: centos7-builder-8c-8g build-timeout: 120 - branch: "master" + branch: "stable/silicon" 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 85f651755..946e7a12d 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index f80d7ac7a..a437c2a15 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -1,4 +1,25 @@ --- +- project: + name: bier-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "bier" + project-name: "bier" + branch: "master" + 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-silicon jobs: @@ -8,7 +29,7 @@ stream: silicon project: "bier" project-name: "bier" - branch: "master" + branch: "stable/silicon" build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: "bier-settings" diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 23104b166..f8e18bc1e 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,29 @@ --- +- project: + name: coe-phosphorus + 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: phosphorus + 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-silicon jobs: @@ -13,7 +38,7 @@ project: "coe" project-name: "coe" stream: silicon - branch: "master" + branch: "stable/silicon" 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 c110d9e5d..b2c926d62 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ functionality: "akka1" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 8dd96a237..d98ab332a 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ elasticsearch-attribute: "disabled" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index f7c374bf3..70b4b7f0e 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index e079a4e17..40587064e 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" 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 2c40dce9c..46b6a29cc 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 22abf952d..bef44f11d 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 4420b17f0..de489b8e4 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 4756dbf84..fc3890e4c 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 32907037b..88a54f8ed 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 9038123d0..7cad11d89 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index b29b2ca56..9ab8573ae 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" 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 cc683e28a..5a9c62286 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 6a12e7faa..1fa23f4be 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: "controller" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 7b3255a59..ba58c6d39 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 26b3f5eb6..f442b3824 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 87482709a..a943672e9 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-phosphorus + 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: phosphorus + 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-silicon jobs: @@ -14,7 +39,7 @@ project: "daexim" project-name: "daexim" stream: silicon - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "daexim-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 4f440af00..a90c876a6 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -254,3 +254,26 @@ distribution-deploy-magnesium, distribution-offline-magnesium, openflowplugin-csit-1node-longevity-only-magnesium + csit-mri-list-phosphorus: > + controller-csit-1node-akka1-all-phosphorus, + controller-csit-1node-benchmark-all-phosphorus, + controller-csit-1node-rest-cars-perf-all-phosphorus, + controller-csit-3node-benchmark-all-phosphorus, + controller-csit-3node-clustering-ask-all-phosphorus, + controller-csit-3node-clustering-tell-all-phosphorus, + controller-csit-3node-rest-clust-cars-perf-ask-only-phosphorus, + controller-csit-3node-rest-clust-cars-perf-tell-only-phosphorus, + mdsal-csit-3node-netty-replicate-only-phosphorus, + yangtools-csit-1node-system-only-phosphorus + csit-weekly-list-phosphorus: > + controller-csit-1node-notifications-longevity-only-phosphorus, + controller-csit-3node-drb-partnheal-longevity-only-phosphorus, + controller-csit-3node-drb-precedence-longevity-only-phosphorus, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-phosphorus, + bgpcep-csit-3node-bgpclustering-longevity-only-phosphorus, + distribution-deploy-phosphorus, + distribution-offline-phosphorus, + openflowplugin-csit-1node-longevity-only-phosphorus + csit-sanity-list-phosphorus: > + openflowplugin-csit-1node-sanity-only-phosphorus, + distribution-sanity-phosphorus diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index d40727002..1554246c4 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -1,4 +1,29 @@ --- +- project: + name: detnet-phosphorus + 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: phosphorus + project: "detnet" + project-name: "detnet" + branch: "master" + 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-silicon jobs: @@ -13,7 +38,7 @@ stream: silicon project: "detnet" project-name: "detnet" - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "detnet-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 867cd6c33..127aa212c 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index e1fba2c64..f82822e96 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,24 @@ --- +- project: + name: dluxapps-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + project: "dluxapps" + project-name: "dluxapps" + stream: phosphorus + branch: "master" + 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-silicon jobs: @@ -8,7 +28,7 @@ project: "dluxapps" project-name: "dluxapps" stream: silicon - branch: "master" + branch: "stable/silicon" build-node: centos7-builder-2c-8g mvn-settings: "dluxapps-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index b3f5877bc..98f57e5f5 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 05e7b8017..78b1f789b 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -16,9 +16,12 @@ testplan: "{project}-{functionality}.txt" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 8a9ab8a79..59c108fc3 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -7,9 +7,12 @@ project: "genius" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 85afc5baf..e901919e9 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,38 @@ --- +- project: + name: genius-phosphorus + jobs: + - "{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 + + stream: phosphorus + 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-silicon jobs: @@ -14,7 +48,7 @@ stream: silicon project: "genius" project-name: "genius" - branch: "master" + branch: "stable/silicon" build-node: centos7-builder-2c-8g java-version: "openjdk11" mvn-settings: "genius-settings" @@ -26,7 +60,9 @@ odlparent-merge-{stream}, openflowplugin-merge-{stream}, neutron-merge-{stream} - email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]" + email-upstream: + "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\ + \ [neutron]" # Used by the release job staging-profile-id: 96fb4b6d9d1ee @@ -59,7 +95,9 @@ odlparent-merge-{stream}, openflowplugin-merge-{stream}, neutron-merge-{stream} - email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]" + email-upstream: + "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\ + \ [neutron]" # Used by the release job staging-profile-id: 96fb4b6d9d1ee @@ -92,7 +130,9 @@ odlparent-merge-{stream}, openflowplugin-merge-{stream}, neutron-merge-{stream} - email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]" + email-upstream: + "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\ + \ [neutron]" # Used by the release job staging-profile-id: 96fb4b6d9d1ee diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index e5aea59ab..940ed771e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,33 @@ --- +- project: + name: groupbasedpolicy-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "groupbasedpolicy" + project-name: "groupbasedpolicy" + branch: "master" + build-node: centos7-builder-2c-8g + mvn-settings: "groupbasedpolicy-settings" + mvn-goals: "-U clean deploy findbugs:findbugs" + mvn-opts: "-Xmx1024m" + 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-silicon jobs: @@ -8,7 +37,7 @@ stream: silicon project: "groupbasedpolicy" project-name: "groupbasedpolicy" - branch: "master" + branch: "stable/silicon" build-node: centos7-builder-2c-8g mvn-settings: "groupbasedpolicy-settings" mvn-goals: "-U clean deploy findbugs:findbugs" @@ -20,7 +49,9 @@ neutron-merge-{stream}, sfc-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]" + email-upstream: + "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\ + \ [sfc] [ovsdb]" disable-job: true # Used by the release job @@ -47,7 +78,9 @@ neutron-merge-{stream}, sfc-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]" + email-upstream: + "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\ + \ [sfc] [ovsdb]" disable-job: true # Used by the release job @@ -74,7 +107,9 @@ neutron-merge-{stream}, sfc-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]" + email-upstream: + "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\ + \ [sfc] [ovsdb]" disable-job: true # Used by the release job diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 453383882..e3b456206 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: "infrautils" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/integration/csit-jobs-phosphorus.lst b/jjb/integration/csit-jobs-phosphorus.lst new file mode 100644 index 000000000..201067400 --- /dev/null +++ b/jjb/integration/csit-jobs-phosphorus.lst @@ -0,0 +1,33 @@ +aaa-csit-1node-authn-all-phosphorus, +bgpcep-csit-1node-bgp-ingest-all-phosphorus, +bgpcep-csit-1node-bgp-ingest-mixed-all-phosphorus, +bgpcep-csit-1node-throughpcep-all-phosphorus, +bgpcep-csit-1node-userfeatures-all-phosphorus, +daexim-csit-1node-basic-only-phosphorus, +daexim-csit-3node-clustering-basic-only-phosphorus, +distribution-csit-1node-userfeatures-all-phosphorus, +distribution-csit-managed-phosphorus, +genius-csit-1node-upstream-only-phosphorus, +genius-csit-3node-upstream-only-phosphorus, +jsonrpc-csit-1node-basic-only-phosphorus, +lispflowmapping-csit-1node-msmr-all-phosphorus, +lispflowmapping-csit-3node-msmr-all-phosphorus, +netconf-csit-1node-callhome-only-phosphorus, +netconf-csit-1node-scale-only-phosphorus, +netconf-csit-1node-userfeatures-all-phosphorus, +netconf-csit-1node-userfeatures-rfc8040-all-phosphorus, +netconf-csit-3node-clustering-only-phosphorus, +netconf-csit-3node-clustering-scale-only-phosphorus, +odltools-csit-1node-upstream-all-phosphorus, +openflowplugin-csit-1node-cbench-only-phosphorus, +openflowplugin-csit-1node-flow-services-all-phosphorus, +openflowplugin-csit-1node-perf-bulkomatic-only-phosphorus, +openflowplugin-csit-1node-perf-stats-collection-only-phosphorus, +openflowplugin-csit-1node-scale-link-only-phosphorus, +openflowplugin-csit-1node-scale-only-phosphorus, +openflowplugin-csit-1node-scale-switch-only-phosphorus, +openflowplugin-csit-3node-clustering-bulkomatic-only-phosphorus, +openflowplugin-csit-3node-clustering-only-phosphorus, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-phosphorus, +ovsdb-csit-1node-upstream-southbound-all-phosphorus, +ovsdb-csit-3node-upstream-clustering-only-phosphorus, diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 0a82bbdf2..f4461f6a8 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: - - silicon: + - phosphorus: branch: "master" mvn-version: "mvn35" java-version: "openjdk11" + csit-list: !include: csit-jobs-phosphorus.lst + build-order: > + odlparent infrautils yangtools mdsal controller serviceutils aaa netconf + daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping + bgpcep integration/distribution + + - silicon: + branch: "stable/silicon" + mvn-version: "mvn35" + java-version: "openjdk11" csit-list: !include: csit-jobs-silicon.lst build-order: > odlparent infrautils yangtools mdsal controller serviceutils aaa netconf @@ -61,8 +71,21 @@ # CSIT Lists in defaults.yaml stream: - - silicon: + - phosphorus: branch: "master" + csit-blocklist: > + bier controller dluxapps genius lispflowmapping l2switch mdsal nemo + netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + gate longevity sanity tdd tempest wip + bgpcep-csit-3node-bgpclustering-all + bgpcep-csit-3node-bgpclustering-ha-only + 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-phosphorus.lst + csit-mri-list: "{csit-mri-list-phosphorus}" + csit-weekly-list: "{csit-weekly-list-phosphorus}" + - silicon: + branch: "stable/silicon" csit-blocklist: > bier controller dluxapps genius lispflowmapping l2switch mdsal nemo netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools @@ -115,9 +138,13 @@ - "integration-sanity-test-{stream}" stream: - - silicon: + - phosphorus: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-phosphorus}" + - silicon: + branch: "stable/silicon" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-silicon}" - aluminium: branch: "stable/aluminium" @@ -170,7 +197,7 @@ - file-id: odl-elastic-cloud target: "$HOME/.netrc" - integration-install-robotframework - # yamllint disable-line rule:line-length + # yamllint disable-line rule:line-length - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243 publishers: @@ -331,7 +358,7 @@ -Pq -Dstream={stream} {opendaylight-infra-mvn-opts} - # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. + # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - "-Xmx4096m -Dmaven.compile.fork=true" settings: integration-settings @@ -344,7 +371,7 @@ goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt {opendaylight-infra-mvn-opts} - # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. + # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - "-Xmx1024m -Dmaven.compile.fork=true" settings: integration-settings diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index dc29dc04f..504c1dcb2 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index c1775f058..2d193a1c5 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: jsonrpc-phosphorus + 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: phosphorus + java-version: "openjdk11" + branch: "master" + 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-silicon jobs: @@ -15,7 +40,7 @@ project-name: "jsonrpc" stream: silicon java-version: "openjdk11" - branch: "master" + branch: "stable/silicon" mvn-settings: "jsonrpc-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 48fb78346..e389d7988 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 5aada2912..f5fd4757f 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index d977e998d..0d9a365e1 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 83e39600f..54d8399d8 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 32a4ec7f8..23f6beaec 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,30 @@ --- +- project: + name: l2switch-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "l2switch" + project-name: "l2switch" + branch: "master" + 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-silicon jobs: @@ -8,7 +34,7 @@ stream: silicon project: "l2switch" project-name: "l2switch" - branch: "master" + branch: "stable/silicon" mvn-settings: "l2switch-settings" mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true" dependencies: > @@ -17,7 +43,9 @@ controller-merge-{stream}, openflowjava-merge-{stream}, openflowplugin-merge-{stream} - email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]" + email-upstream: + "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\ + \ [openflowplugin]" disable-job: true # Used by the release job @@ -41,7 +69,9 @@ controller-merge-{stream}, openflowjava-merge-{stream}, openflowplugin-merge-{stream} - email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]" + email-upstream: + "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\ + \ [openflowplugin]" disable-job: true # Used by the release job diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 99f979c46..d5c7d1819 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index ebeadb63a..25598d58f 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,36 @@ --- +- project: + name: lispflowmapping-phosphorus + 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: phosphorus + 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-silicon jobs: @@ -15,7 +47,7 @@ stream: silicon project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/silicon" 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 94ed4421f..c5ed3ba39 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ functionality: "bindingv1" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 266185602..bedb8fba5 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 79cb62eb5..8c5096c91 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: "mdsal" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 94a514799..f5117303f 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 827bc49d7..210a975ad 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,23 @@ --- +- project: + name: nemo-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "nemo" + project-name: "nemo" + branch: "master" + 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-silicon jobs: @@ -8,7 +27,7 @@ stream: silicon project: "nemo" project-name: "nemo" - branch: "master" + branch: "stable/silicon" mvn-settings: "nemo-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 0c3e439e3..03083928f 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 83b079bc5..4119d427f 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index e5a644677..2b6d9dea2 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index ac880062c..b86f948d2 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -7,9 +7,12 @@ project: "netconf" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 050e557fb..94532319e 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" @@ -52,27 +55,34 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" robot-options: - "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 - -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200 -v TESTTOOL_BOOT_TIMEOUT:600s - -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" + "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ + \ INIT_DEVICE_COUNT:400 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200\ + \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + robot-options: + "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ + \ INIT_DEVICE_COUNT:400 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200\ + \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" - aluminium: branch: "stable/aluminium" jre: "openjdk11" robot-options: - "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:1000 - -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500 -v TESTTOOL_BOOT_TIMEOUT:600s - -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" + "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ + \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500\ + \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" - magnesium: branch: "stable/magnesium" jre: "openjdk11" robot-options: - "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250 - -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s - -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" + "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ + \ INIT_DEVICE_COUNT:250 -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100\ + \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 888be65d8..ec9e174c7 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -18,9 +18,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 179dbdc7a..83b4f6d52 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -104,10 +104,14 @@ project: "netvirt" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + testplan: "{project}-{topology}-openstack-upgrade.txt" odl-ml2-driver-version: "v2" enable-openstack-services: "placement-api,l2gw-plugin" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index c80780b6a..fcea39191 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -51,7 +51,7 @@ testplan: "{project}-{topology}-dcgw-openstack.txt" tools_system_count: 3 enable-gre-type-driver: "yes" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "{schedule-weekly}" @@ -135,7 +135,7 @@ testplan: "{project}-{topology}-dcgw-openstack.txt" tools_system_count: 3 enable-gre-type-driver: "yes" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "{schedule-weekly}" @@ -218,7 +218,7 @@ testplan: "{project}-{topology}-dcgw-openstack.txt" tools_system_count: 3 enable-gre-type-driver: "yes" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "{schedule-weekly}" @@ -303,7 +303,7 @@ testplan: "{project}-{topology}-dcgw-openstack.txt" tools_system_count: 3 enable-gre-type-driver: "yes" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "{schedule-weekly}" @@ -392,7 +392,7 @@ tools_system_count: 3 schedule: "{schedule-weekly}" enable-gre-type-driver: "yes" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "{schedule-weekly}" @@ -473,7 +473,7 @@ odl-snat-mode: "conntrack" - gate-minimal-cluster: testplan: "{project}-{topology}-minimal-openstack.txt" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "" @@ -554,7 +554,7 @@ odl-snat-mode: "conntrack" - gate-minimal-cluster: testplan: "{project}-{topology}-minimal-openstack.txt" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "" @@ -602,10 +602,14 @@ os-cmp-cnt: 0 stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + topology: - 1node: openstack_system2_count: 0 @@ -640,7 +644,7 @@ tools_system_count: 3 enable-gre-type-driver: "yes" schedule: "{schedule-daily}" - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - gate-tdd-wip: testplan: "{project}-{topology}-tdd-wip-openstack.txt" schedule: "" diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index aecfca9a5..f237dd89b 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: "netvirt" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index f67686067..056fbac01 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -1,4 +1,42 @@ --- +- project: + name: netvirt-phosphorus + jobs: + - "{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 + + stream: phosphorus + 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-silicon jobs: @@ -14,7 +52,7 @@ - odl-maven-verify-jobs stream: silicon - branch: "master" + branch: "stable/silicon" project: "netvirt" project-name: "netvirt" @@ -30,7 +68,9 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]" + email-upstream: + "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\ + \ [ovsdb]" # Used by the release job staging-profile-id: a67da0ffbb1ba @@ -67,7 +107,9 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]" + email-upstream: + "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\ + \ [ovsdb]" # Used by the release job staging-profile-id: a67da0ffbb1ba @@ -104,7 +146,9 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream}, ovsdb-merge-{stream} - email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]" + email-upstream: + "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\ + \ [ovsdb]" # Used by the release job staging-profile-id: a67da0ffbb1ba diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 783fc8195..6c3f0f443 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,8 +7,10 @@ project: "neutron" stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 82ae533cf..0e95f91d9 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,26 @@ --- +- project: + name: neutron-phosphorus + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs" + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: phosphorus + 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-silicon jobs: @@ -11,7 +33,7 @@ project: "neutron" project-name: "neutron" build-timeout: 90 - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "neutron-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml index f6efcb9e2..a5ff2f731 100644 --- a/jjb/odlmicro/odlmicro-csit.yaml +++ b/jjb/odlmicro/odlmicro-csit.yaml @@ -13,7 +13,7 @@ # Project branches. stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" functionality: "netconf" @@ -21,6 +21,14 @@ -e ODLMICRO_IGN -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + functionality: "netconf" + robot-options: > + -e ODLMICRO_IGN + -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT + -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT - aluminium: branch: "stable/aluminium" jre: "openjdk11" @@ -51,7 +59,7 @@ # Project branches. stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" functionality: "netconf-devices-scale" @@ -63,6 +71,18 @@ -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 -v SCALE_TESTS:TRUE + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + functionality: "netconf-devices-scale" + robot-options: > + -e ODLMICRO_IGN + -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT + -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT + -v USE_NETCONF_CONNECTOR:False + -v SCHEMA_MODEL:juniper + -v INIT_DEVICE_COUNT:400 + -v SCALE_TESTS:TRUE - aluminium: branch: "stable/aluminium" jre: "openjdk11" @@ -105,7 +125,7 @@ # Project branches. stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" functionality: "netconf-general-scale" @@ -117,6 +137,18 @@ -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 -v SCALE_TESTS:TRUE + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + functionality: "netconf-general-scale" + robot-options: > + -e ODLMICRO_IGN + -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT + -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT + -v USE_NETCONF_CONNECTOR:False + -v SCHEMA_MODEL:juniper + -v INIT_DEVICE_COUNT:400 + -v SCALE_TESTS:TRUE - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index b2a1e7680..978ba1e0f 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -1,4 +1,23 @@ --- +- project: + name: odlmicro-phosphorus + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: phosphorus + project: odlmicro + project-name: "odlmicro" + branch: "master" + 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-silicon jobs: @@ -8,7 +27,7 @@ stream: silicon project: odlmicro project-name: "odlmicro" - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" build-node: centos7-builder-2c-2g build-timeout: 60 diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index a89a46509..d965488c5 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,8 +7,10 @@ project: "odlparent" stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index 06cd6093a..2c5cf969e 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -1,4 +1,24 @@ --- +- project: + name: odlsaf-phosphorus + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: phosphorus + project: "odlsaf" + project-name: "odlsaf" + build-node: centos7-builder-4c-4g + build-timeout: 120 + branch: "master" + 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-silicon jobs: @@ -10,7 +30,7 @@ project-name: "odlsaf" build-node: centos7-builder-4c-4g build-timeout: 120 - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "odlsaf-settings" mvn-opts: "-Xmx2048m" diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 327ad08a0..f25fa3295 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,9 +10,12 @@ testplan: "{project}-basic.txt" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index ea11a7200..169fedf3f 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 56b5fa56b..ca574c2aa 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,23 @@ --- +- project: + name: of-config-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "of-config" + project-name: "of-config" + branch: "master" + 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-silicon jobs: @@ -8,7 +27,7 @@ stream: silicon project: "of-config" project-name: "of-config" - branch: "master" + branch: "stable/silicon" mvn-settings: "of-config-settings" mvn-opts: "-Xmx1024m" dependencies: netconf-merge-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index b45d55a7d..15beb0293 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 2e6099de7..2cc283371 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 9e1bdada4..75aa05d30 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 813769bcf..5b8f2e2cb 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 1c2c86764..b311c682f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index ce09d5919..14d96f180 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,10 +14,14 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" install: "all" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" + install: "all" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 939796b3b..752e0c0c0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -16,9 +16,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 52222574e..0daba8743 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index d6d6141c2..9fab2adcd 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: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index cc6828832..08a79bbc1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index f821b47a0..297eca372 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 554894418..9b8613c9a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 846b73d25..df11aec17 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 829abf6e0..fb7b69847 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 255010acf..4b2667902 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,38 @@ --- +- project: + name: openflowplugin-phosphorus + 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 + + stream: phosphorus + 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-silicon jobs: @@ -16,7 +50,7 @@ stream: silicon project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/silicon" 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 d68668321..6977b77b9 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - "opflex-merge-{stream}" stream: - - silicon: + - phosphorus: branch: "master" libuv-version: "1.20.2" rapidjson-version: "1.1.0" openvswitch-version: "2.12.0" + - silicon: + branch: "stable/silicon" + libuv-version: "1.20.2" + rapidjson-version: "1.1.0" + openvswitch-version: "2.12.0" - aluminium: branch: "stable/aluminium" libuv-version: "1.20.2" @@ -49,18 +54,21 @@ refspec: "refs/heads/{branch}" artifacts: "{archive-artifacts}" - string: - name: LIBUV_VERSION - # yamllint disable-line rule:line-length + name: + LIBUV_VERSION + # yamllint disable-line rule:line-length default: "{libuv-version}" description: "libuv version" - string: - name: RAPIDJSON_VERSION - # yamllint disable-line rule:line-length + name: + RAPIDJSON_VERSION + # yamllint disable-line rule:line-length default: "{rapidjson-version}" description: "rapidjson version" - string: - name: OPENVSWITCH_VERSION - # yamllint disable-line rule:line-length + name: + OPENVSWITCH_VERSION + # yamllint disable-line rule:line-length default: "{openvswitch-version}" description: "openvswitch-version" @@ -110,18 +118,21 @@ refspec: "refs/heads/{branch}" artifacts: "" - string: - name: LIBUV_VERSION - # yamllint disable-line rule:line-length + name: + LIBUV_VERSION + # yamllint disable-line rule:line-length default: "{libuv-version}" description: "libuv version" - string: - name: RAPIDJSON_VERSION - # yamllint disable-line rule:line-length + name: + RAPIDJSON_VERSION + # yamllint disable-line rule:line-length default: "{rapidjson-version}" description: "rapidjson version" - string: - name: OPENVSWITCH_VERSION - # yamllint disable-line rule:line-length + name: + OPENVSWITCH_VERSION + # yamllint disable-line rule:line-length default: "{openvswitch-version}" description: "openvswitch version" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index aa65f175b..428ddbe1c 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 001b04c98..9f35a9ac3 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index fdbe98a0c..04a0ea1b8 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: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index dabb4fbbe..0b0a0072a 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: "ovsdb" stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 5955558ba..ca2647613 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ovsdb-phosphorus + 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 + + stream: phosphorus + 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-silicon jobs: @@ -15,7 +42,7 @@ stream: silicon project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/silicon" 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 c8832f824..69d3e9e1d 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,23 @@ --- +- project: + name: p4plugin-phosphorus + jobs: + - "{project-name}-maven-javadoc-jobs" + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "p4plugin" + project-name: "p4plugin" + branch: "master" + mvn-settings: "p4plugin-settings" + mvn-opts: "-Xmx1024m" + dependencies: "" + email-upstream: "[p4plugin]" + + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-silicon jobs: @@ -9,7 +28,7 @@ stream: silicon project: "p4plugin" project-name: "p4plugin" - branch: "master" + branch: "stable/silicon" mvn-settings: "p4plugin-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 090f53e52..b39ec57f1 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index fa9744e3c..f67129aef 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,23 @@ --- +- project: + name: packetcable-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "packetcable" + project-name: "packetcable" + branch: "master" + 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-silicon jobs: @@ -8,7 +27,7 @@ stream: silicon project: "packetcable" project-name: "packetcable" - branch: "master" + branch: "stable/silicon" mvn-settings: "packetcable-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index b435eab94..aa2e7fa02 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,8 +7,10 @@ project: "serviceutils" stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 4926281f7..9a9656900 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-silicon + name: serviceutils-phosphorus jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs" @@ -13,6 +13,39 @@ - odl-maven-verify-jobs branch: "master" + stream: phosphorus + + 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-silicon + 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/silicon" stream: silicon project: "serviceutils" diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 50674360c..810c901ac 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 7a11c799c..1dc97267e 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 3ea6e59d6..0f67df687 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" java-version: "openjdk11" + - silicon: + branch: "stable/silicon" + java-version: "openjdk11" - aluminium: branch: "stable/aluminium" java-version: "openjdk11" diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index e690bfd59..1bd4f5d99 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -5,8 +5,10 @@ - "gerrit-tox-verify" stream: - - silicon: + - phosphorus: branch: "master" + - silicon: + branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - magnesium: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index a18958e0e..a02fee1db 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,30 @@ --- +- project: + name: sfc-phosphorus + 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: phosphorus + 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-silicon jobs: @@ -13,7 +39,7 @@ stream: silicon project: "sfc" project-name: "sfc" - branch: "master" + branch: "stable/silicon" 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 0f07d2e6f..31bf3eb5a 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,22 @@ --- +- project: + name: snmp-phosphorus + jobs: + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "snmp" + project-name: "snmp" + branch: "master" + 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-silicon jobs: @@ -8,7 +26,7 @@ stream: silicon project: "snmp" project-name: "snmp" - branch: "master" + branch: "stable/silicon" mvn-settings: "snmp-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream}" diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 6025519f9..7fb6aa10a 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,27 @@ --- +- project: + name: snmp4sdn-phosphorus + 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: phosphorus + project: "snmp4sdn" + project-name: "snmp4sdn" + branch: "master" + 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-silicon jobs: @@ -13,7 +36,7 @@ stream: silicon project: "snmp4sdn" project-name: "snmp4sdn" - branch: "master" + branch: "stable/silicon" mvn-settings: "snmp4sdn-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index bfea4a45f..1370cb42c 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 2d1f80319..4f206daad 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 89e24da5a..000e42a35 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 22dae0ec7..f9abe90f4 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 08f5578aa..f75dff42e 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 9cb5c0de9..ce1a33822 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 1d2b79faa..cd52b4248 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index d78ccf77e..06a2efa0b 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: sxp-phosphorus + 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: phosphorus + project: "sxp" + project-name: "sxp" + branch: "master" + + 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-silicon jobs: @@ -15,7 +42,7 @@ stream: silicon project: "sxp" project-name: "sxp" - branch: "master" + branch: "stable/silicon" mvn-settings: "sxp-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index c0b2d39c9..f6f8c7ffa 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index ff87b8d81..71f721774 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -1,4 +1,29 @@ --- +- project: + name: telemetry-phosphorus + 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: phosphorus + project: "telemetry" + project-name: "telemetry" + branch: "master" + 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-silicon jobs: @@ -14,7 +39,7 @@ stream: silicon project: "telemetry" project-name: "telemetry" - branch: "master" + branch: "stable/silicon" mvn-settings: "telemetry-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 78246b440..68a950aa0 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,31 @@ --- +- project: + name: transportpce-phosphorus + 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: 140 + build-node: centos7-builder-4c-16g + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: "transportpce" + project-name: "transportpce" + stream: phosphorus + branch: "master" + 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-silicon jobs: @@ -16,7 +43,7 @@ project: "transportpce" project-name: "transportpce" stream: silicon - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index ebbc588c8..e6d3cd949 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 982a932d9..b1fb21a92 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 160f68b0d..4c7d127e9 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 5fe72bee6..33d2f60ac 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index c27264961..cb45be896 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,27 @@ --- +- project: + name: tsdr-phosphorus + 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: phosphorus + project: "tsdr" + project-name: "tsdr" + branch: "master" + mvn-settings: "tsdr-settings" + mvn-opts: "-Xmx1024m" + dependencies: "" + email-upstream: "[tsdr]" + + # Used by the release job + staging-profile-id: a69373036303c + - project: name: tsdr-silicon jobs: @@ -13,7 +36,7 @@ stream: silicon project: "tsdr" project-name: "tsdr" - branch: "master" + branch: "stable/silicon" mvn-settings: "tsdr-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index fdd45ceef..dabac9d4c 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,33 @@ --- +- project: + name: unimgr-phosphorus + 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: phosphorus + project: "unimgr" + project-name: "unimgr" + branch: "master" + 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-silicon jobs: @@ -13,7 +42,7 @@ stream: silicon project: "unimgr" project-name: "unimgr" - branch: "master" + branch: "stable/silicon" java-version: "openjdk11" mvn-settings: "unimgr-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index e77b1baa4..b0fa5de3c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 7b3f549e5..116decf25 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,23 @@ --- +- project: + name: usc-phosphorus + jobs: + - "{project-name}-maven-javadoc-jobs" + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: phosphorus + project: "usc" + project-name: "usc" + branch: "master" + 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-silicon jobs: @@ -9,7 +28,7 @@ stream: silicon project: "usc" project-name: "usc" - branch: "master" + branch: "stable/silicon" mvn-settings: "usc-settings" mvn-opts: "-Xmx1024m" dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}" diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 92148be94..9905290fd 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,9 +12,12 @@ # Project branches. stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 469af901e..9957520e3 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: "yangtools" stream: - - silicon: + - phosphorus: branch: "master" jre: "openjdk11" + - silicon: + branch: "stable/silicon" + jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" -- 2.36.6