From a75eb83c7b3f4b166d4ef71516b162deaa62a2d5 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 14 Sep 2021 12:06:16 +1000 Subject: [PATCH] Feat: Add branch stable/phosphorus Bump master branch to Sulfur and add new branch stable/phosphorus. Note: master stream renamed as 'Sulfur' instead of 'Sulpher'. Issue-ID: LF-JIRA RELENG-3814 Change-Id: I7360f54d433b6523f1df67ad938df10d919f76b5 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 5 ++- jjb/aaa/aaa-patch-test.yaml | 5 ++- 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 | 5 ++- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 5 ++- .../bgpcep-csit-bgpclustering-longevity.yaml | 7 +++- 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/controller/controller-csit-akka1.yaml | 5 ++- .../controller-csit-clustering.yaml | 5 ++- .../controller-csit-cs-chasing-leader.yaml | 7 +++- .../controller-csit-cs-partnheal.yaml | 7 +++- ...ontroller-csit-ddb-expl-lead-movement.yaml | 7 +++- .../controller-csit-dnb-noloss.yaml | 7 +++- .../controller-csit-drb-partnheal.yaml | 7 +++- .../controller-csit-drb-precedence.yaml | 7 +++- .../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 | 21 ++++++++++ jjb/dluxapps/dluxapps-csit-yangman.yaml | 5 ++- jjb/docs/docs-rtd.yaml | 4 +- jjb/infrautils/infrautils-patch-test.yaml | 5 ++- jjb/integration/csit-jobs-sulfur.lst | 21 ++++++++++ .../distribution/distribution-jobs.yaml | 28 ++++++++++++-- jjb/integration/integration-test-jobs.yaml | 35 +++++++++++++++-- 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 ++- .../lispflowmapping-csit-msmr.yaml | 5 ++- jjb/lispflowmapping/lispflowmapping.yaml | 34 ++++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 ++- jjb/mdsal/mdsal-csit-netty-replication.yaml | 11 +++++- jjb/mdsal/mdsal-patch-test.yaml | 5 ++- jjb/netconf/netconf-scale.yaml | 9 ++++- .../netvirt-csit-multi-openstack-upgrade.yaml | 6 ++- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 22 ++++++----- jjb/netvirt/netvirt-patch-test.yaml | 5 ++- jjb/neutron/neutron-patch-test.yaml | 4 +- jjb/neutron/neutron.yaml | 2 +- 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 +- .../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 | 7 +++- .../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 | 34 ++++++++++++++++- 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 | 28 +++++++++++++- jjb/p4plugin/p4plugin.yaml | 21 +++++++++- jjb/serviceutils/serviceutils-patch-test.yaml | 4 +- jjb/serviceutils/serviceutils.yaml | 34 ++++++++++++++++- 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/transportpce/transportpce.yaml | 30 ++++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 5 ++- jjb/yangtools/yangtools-patch-test.yaml | 5 ++- 92 files changed, 767 insertions(+), 114 deletions(-) create mode 100644 jjb/integration/csit-jobs-sulfur.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 26e8409bf..51ff7cdec 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index ccdc972b1..96f547491 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: "aaa" stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 9d6fa5ed7..185b64888 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,22 @@ --- +- project: + name: archetypes-sulfur + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: sulfur + 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-phosphorus jobs: @@ -8,7 +26,7 @@ stream: phosphorus project: "archetypes" project-name: "archetypes" - branch: "master" + branch: "stable/phosphorus" 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 ba9224364..fee0354f4 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -13,9 +13,12 @@ - gerrit-tox-verify stream: - - phosphorus: + - sulfur: branch: "master" integration-test: phosphorus + - phosphorus: + branch: "stable/phosphorus" + integration-test: phosphorus - silicon: branch: "stable/silicon" integration-test: silicon diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 77ceb4659..1fbc9cb0f 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: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 8ec2890c5..4d8ca3e3c 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 0933d9a71..2e516db3d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 157b39c75..7157b9fe6 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index b9f3a84ca..d79d3f570 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -11,13 +11,16 @@ functionality: "bgpclustering-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index acc6bb791..36866c197 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index a4edec8f2..acd6b40e4 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index c65065868..2b653c48e 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index ce3dcf207..9702222e5 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 22da66b73..7d5f7eba8 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ functionality: "akka1" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index b48edc317..ec33db831 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ elasticsearch-attribute: "disabled" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 1cb0cec64..f35e89082 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -11,13 +11,16 @@ functionality: "cs-chasing-leader-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 697a4d539..a3d1ba7e9 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -11,13 +11,16 @@ functionality: "cs-partnheal-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" 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 d844c6970..0587e79e2 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -11,13 +11,16 @@ functionality: "ddb-expl-lead-movement-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 5f304f042..b75ffd58b 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -11,13 +11,16 @@ functionality: "notifications-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index fb45b7832..378850030 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -11,13 +11,16 @@ functionality: "drb-partnheal-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index e5ddddac8..aa88ab063 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -11,13 +11,16 @@ functionality: "drb-precedence-longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 7b80ca4e3..fb4ed988a 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 4a175a064..9368e149d 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 3457c1544..fd463c516 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" 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 aceec9f93..54d18d540 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index e7e367f39..46656a77e 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: "controller" stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "3.0.x" java-version: "openjdk11" diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 8297973db..209f583fc 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index c6b84dd2a..08b64df75 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 1e22f4cfc..0a4e37c5b 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-sulfur + 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: sulfur + 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-phosphorus jobs: @@ -14,7 +39,7 @@ project: "daexim" project-name: "daexim" stream: phosphorus - branch: "master" + branch: "stable/phosphorus" java-version: "openjdk11" mvn-settings: "daexim-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index b227f087c..a01e2f8d7 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -298,3 +298,24 @@ csit-sanity-list-phosphorus: > openflowplugin-csit-1node-sanity-only-phosphorus, distribution-sanity-phosphorus + csit-mri-list-sulfur: > + aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur, + controller-csit-1node-benchmark-all-sulfur, controller-csit-1node-rest-cars-perf-all-sulfur, + controller-csit-3node-benchmark-all-sulfur, + controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur, + controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur, + controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur, + mdsal-csit-3node-netty-replicate-only-sulfur, netconf-csit-1node-callhome-only-master, + netconf-csit-1node-scale-max-devices-only-master, netconf-csit-1node-scale-only-master, + netconf-csit-1node-userfeatures-all-master, netconf-csit-1node-userfeatures-rfc8040-all-master, + netconf-csit-3node-clustering-only-master, netconf-csit-3node-clustering-scale-only-master, + yangtools-csit-1node-system-only-sulfur + csit-weekly-list-sulfur: > + controller-csit-1node-notifications-longevity-only-sulfur, + controller-csit-3node-drb-partnheal-longevity-only-sulfur, + controller-csit-3node-drb-precedence-longevity-only-sulfur, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur, + bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur, + distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur + csit-sanity-list-sulfur: > + openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 0050f6a42..6183c161b 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index b246d2cfc..b2e86ef0b 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index b459c7f0d..e56e68159 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -7,9 +7,12 @@ project: "infrautils" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/integration/csit-jobs-sulfur.lst b/jjb/integration/csit-jobs-sulfur.lst new file mode 100644 index 000000000..1bbb9d8ac --- /dev/null +++ b/jjb/integration/csit-jobs-sulfur.lst @@ -0,0 +1,21 @@ +bgpcep-csit-1node-bgp-ingest-all-sulfur, +bgpcep-csit-1node-bgp-ingest-mixed-all-sulfur, +bgpcep-csit-1node-throughpcep-all-sulfur, +bgpcep-csit-1node-userfeatures-all-sulfur, +daexim-csit-1node-basic-only-sulfur, +daexim-csit-3node-clustering-basic-only-sulfur, +distribution-csit-managed-sulfur, +jsonrpc-csit-1node-basic-only-sulfur, +odltools-csit-1node-upstream-all-sulfur, +openflowplugin-csit-1node-cbench-only-sulfur, +openflowplugin-csit-1node-flow-services-all-sulfur, +openflowplugin-csit-1node-perf-bulkomatic-only-sulfur, +openflowplugin-csit-1node-perf-stats-collection-only-sulfur, +openflowplugin-csit-1node-scale-link-only-sulfur, +openflowplugin-csit-1node-scale-only-sulfur, +openflowplugin-csit-1node-scale-switch-only-sulfur, +openflowplugin-csit-3node-clustering-bulkomatic-only-sulfur, +openflowplugin-csit-3node-clustering-only-sulfur, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sulfur, +ovsdb-csit-1node-upstream-southbound-all-sulfur, +ovsdb-csit-3node-upstream-clustering-only-sulfur, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 42be4bd8a..5f0878d93 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -24,8 +24,10 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: @@ -55,7 +57,7 @@ dist-pom: "distribution/pom.xml" stream: - - phosphorus: + - sulfur: branch: "master" dependencies: > bgpcep-maven-merge-{stream}, @@ -67,6 +69,18 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, + - phosphorus: + branch: "stable/phosphorus" + dependencies: > + bgpcep-maven-merge-{stream}, + daexim-maven-merge-{stream}, + jsonrpc-maven-merge-{stream}, + lispflowmapping-maven-merge-{stream}, + netconf-maven-merge-{stream}, + neutron-maven-merge-{stream}, + openflowplugin-maven-merge-{stream}, + ovsdb-maven-merge-{stream}, + serviceutils-maven-merge-{stream}, - silicon: branch: "stable/silicon" dependencies: > @@ -116,10 +130,14 @@ karaf-version: odl dist-pom: "distribution/opendaylight/pom.xml" stream: - - phosphorus: + - sulfur: branch: "master" dependencies: > distribution-merge-managed-{stream}, + - phosphorus: + branch: "stable/phosphorus" + dependencies: > + distribution-merge-managed-{stream}, - silicon: branch: "stable/silicon" dependencies: > @@ -148,8 +166,10 @@ staging-profile-id: 2af042ed81d5e2 stream: - - phospshorus: + - sulfur: branch: "master" + - phospshorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 0baa6db29..63595dedd 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: - - phosphorus: + - sulfur: branch: "master" mvn-version: "mvn35" java-version: "openjdk11" + csit-list: !include: csit-jobs-sulfur.lst + build-order: > + odlparent infrautils yangtools mdsal controller serviceutils aaa netconf + daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping + bgpcep integration/distribution + + - phosphorus: + branch: "stable/phosphorus" + mvn-version: "mvn35" + java-version: "openjdk11" csit-list: !include: csit-jobs-phosphorus.lst build-order: > odlparent infrautils yangtools mdsal controller serviceutils aaa netconf @@ -61,8 +71,21 @@ # CSIT Lists in defaults.yaml stream: - - phosphorus: + - sulfur: branch: "master" + csit-blocklist: > + aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo + netconf 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-sulfur.lst + csit-mri-list: "{csit-mri-list-sulfur}" + csit-weekly-list: "{csit-weekly-list-sulfur}" + - phosphorus: + branch: "stable/phosphorus" csit-blocklist: > aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools @@ -112,9 +135,13 @@ - "integration-sanity-test-{stream}" stream: - - phosphorus: + - sulfur: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-sulfur}" + - phosphorus: + branch: "stable/phosphorus" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-phosphorus}" - silicon: branch: "stable/silicon" @@ -167,7 +194,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: diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index b494f0d13..910d7c468 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 11ba9beaf..7880527bd 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: jsonrpc-sulfur + 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: sulfur + 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-phosphorus jobs: @@ -15,7 +40,7 @@ project-name: "jsonrpc" stream: phosphorus java-version: "openjdk11" - branch: "master" + branch: "stable/phosphorus" 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 f68f89b84..aa00faa35 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index b0a9d4f8a..78996a18c 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 58003f09b..1beea9b9e 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index fa7e6d74b..c4f39c077 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 35c5ce585..5121ae3f6 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 6d36a9602..d2c3f3bd1 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,36 @@ --- +- project: + name: lispflowmapping-sulfur + 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: sulfur + 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-phosphorus jobs: @@ -15,7 +47,7 @@ stream: phosphorus project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/phosphorus" 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 54f92b654..9e993e4c3 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ functionality: "bindingv1" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index a20e4bd3a..79da29316 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -12,7 +12,7 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" install-features: > @@ -21,6 +21,15 @@ odl-restconf-nb-bierman02, odl-netconf-clustered-topology, odl-clustering-test-app + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-restconf-nb-bierman02, + odl-netconf-clustered-topology, + odl-clustering-test-app - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 49838f97e..a298aba69 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -7,9 +7,12 @@ project: "mdsal" stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index a08f3c288..0ce1f2940 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -54,13 +54,20 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" robot-options: "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\ \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" + robot-options: + "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ + \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\ + \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 9a5064868..f99457a1f 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -97,10 +97,14 @@ project: "netvirt" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" + - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 3e79e321f..f38f9f9fe 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" tools_system_count: 3 @@ -83,7 +83,7 @@ name: netvirt-csit-openstack-integration-silicon-stein jobs: - inttest-csit-openstack-custom - #temporarily disabling Stein jobs + # temporarily disabling Stein jobs disable-job: true project: "netvirt" stream: "silicon" @@ -132,7 +132,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" tools_system_count: 3 @@ -212,7 +212,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" tools_system_count: 3 @@ -245,7 +245,7 @@ jobs: - inttest-csit-openstack-custom - #temporarily disabling Stein jobs + # temporarily disabling Stein jobs disable-job: true project: "netvirt" stream: "aluminium" @@ -294,7 +294,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" tools_system_count: 3 @@ -327,7 +327,7 @@ jobs: - inttest-csit-openstack-custom - #temporarily disabling Stein jobs + # temporarily disabling Stein jobs disable-job: true project: "netvirt" testplan: "{project}-{topology}-openstack.txt" @@ -341,10 +341,14 @@ os-cmp-cnt: 0 stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" + - silicon: branch: "stable/silicon" jre: "openjdk11" @@ -379,7 +383,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" - tempest-stateful: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 9a5f57dd6..40e9cd764 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -7,9 +7,12 @@ project: "netvirt" stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index d4de8d2b8..47c112752 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,8 +7,10 @@ project: "neutron" stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 5cd316bb6..61c05a2e3 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -10,7 +10,7 @@ project: "neutron" project-name: "neutron" build-timeout: 90 - branch: "master" + branch: "stable/phosphorus" 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 a5ff2f731..63bcb300d 100644 --- a/jjb/odlmicro/odlmicro-csit.yaml +++ b/jjb/odlmicro/odlmicro-csit.yaml @@ -13,7 +13,7 @@ # Project branches. stream: - - phosphorus: + - sulfur: 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 + - phosphorus: + branch: "stable/phosphorus" + 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 - silicon: branch: "stable/silicon" jre: "openjdk11" @@ -59,7 +67,7 @@ # Project branches. stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" functionality: "netconf-devices-scale" @@ -71,6 +79,18 @@ -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 -v SCALE_TESTS:TRUE + - phosphorus: + branch: "stable/phosphorus" + 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 - silicon: branch: "stable/silicon" jre: "openjdk11" @@ -125,7 +145,7 @@ # Project branches. stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" functionality: "netconf-general-scale" @@ -137,6 +157,18 @@ -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 -v SCALE_TESTS:TRUE + - phosphorus: + branch: "stable/phosphorus" + 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 - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index 978ba1e0f..f649de10f 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -1,4 +1,23 @@ --- +- project: + name: odlmicro-sulfur + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: sulfur + 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-phosphorus jobs: @@ -8,7 +27,7 @@ stream: phosphorus project: odlmicro project-name: "odlmicro" - branch: "master" + branch: "stable/phosphorus" 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 8939180cc..2c3e86912 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -7,8 +7,10 @@ project: "odlparent" stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index 2c5cf969e..fdc196aa6 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -1,4 +1,24 @@ --- +- project: + name: odlsaf-sulfur + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: sulfur + 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-phosphorus jobs: @@ -10,7 +30,7 @@ project-name: "odlsaf" build-node: centos7-builder-4c-4g build-timeout: 120 - branch: "master" + branch: "stable/phosphorus" 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 23a14691a..55f28bc2b 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,9 +10,12 @@ testplan: "{project}-basic.txt" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 9a813510a..98bb1619f 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 392846bcc..b89ff1e0d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index a66083d13..95abb00bc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 21ff1794a..ffe8551fb 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 8bc009816..c68d59961 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index ecb5d8c3b..442feb438 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,10 +14,14 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" install: "all" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" + install: "all" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 3f0b4e17d..594d4efec 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -12,13 +12,16 @@ functionality: "longevity" # Set elasticsearch attribute to value 'long' for longevity jobs - #elasticsearch-attribute: 'long' + # elasticsearch-attribute: 'long' # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 2918f17b2..3f91d3d6e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 58a20d294..793c26825 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: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index f68de4c61..352a9d04f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 02817a04c..e01b5a988 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index d4baa939d..1d81ea8cc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 992d6750f..b146ead86 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 216d02110..5baebd089 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 3758d4135..e924c905f 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,36 @@ --- +- project: + name: openflowplugin-sulfur + 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: sulfur + project: "openflowplugin" + project-name: "openflowplugin" + branch: "master" + build-node: centos7-builder-4c-4g + build-timeout: 90 + java-version: "openjdk11" + mvn-settings: "openflowplugin-settings" + mvn-goals: "clean deploy javadoc:aggregate" + 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-phosphorus jobs: @@ -16,7 +48,7 @@ stream: phosphorus project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/phosphorus" build-node: centos7-builder-4c-4g build-timeout: 90 java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index d1a6f8f48..488c44195 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index fcd1b5c42..8c6829dce 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index bd2325050..4c5a59869 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: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 493978ac2..7dd533c89 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: "ovsdb" stream: - - phosphorus: + - sulfur: branch: "master" java-version: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + java-version: "openjdk11" - silicon: branch: "stable/silicon" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 173b31ba2..094b331fc 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,30 @@ --- +- project: + name: ovsdb-sulfur + 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: sulfur + project: "ovsdb" + project-name: "ovsdb" + branch: "master" + build-node: centos7-builder-4c-4g + java-version: "openjdk11" + mvn-settings: "ovsdb-settings" + 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-phosphorus jobs: @@ -15,7 +41,7 @@ stream: phosphorus project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/phosphorus" build-node: centos7-builder-4c-4g java-version: "openjdk11" mvn-settings: "ovsdb-settings" diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index b2ea5b1b5..769d27919 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,23 @@ --- +- project: + name: p4plugin-sulfur + jobs: + - "{project-name}-maven-javadoc-jobs" + - odl-maven-jobs + - odl-maven-verify-jobs + + stream: sulfur + 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-phosphorus jobs: @@ -9,7 +28,7 @@ stream: phosphorus project: "p4plugin" project-name: "p4plugin" - branch: "master" + branch: "stable/phosphorus" mvn-settings: "p4plugin-settings" mvn-opts: "-Xmx1024m" dependencies: "" diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index a38df8164..ceacfd0e7 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,8 +7,10 @@ project: "serviceutils" stream: - - phosphorus: + - sulfur: branch: "master" + - phosphorus: + branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - aluminium: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 50ba04b5c..91e4af944 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-phosphorus + name: serviceutils-sulfur jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs" @@ -13,6 +13,38 @@ - odl-maven-verify-jobs branch: "master" + stream: sulfur + + 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-phosphorus + 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/phosphorus" stream: phosphorus project: "serviceutils" diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index c49b9c9ab..c86a03abd 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index fc1ddf4e0..eb3101fd9 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 6b6e7cab8..48f637f45 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 3d01a6f79..1ddb45095 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 2b932a347..3b85253e4 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index a981c1525..5d692f33d 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 2190c0fc4..b7164740e 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 1221bf20d..19eadca36 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: sxp-sulfur + 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: sulfur + 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-phosphorus jobs: @@ -15,7 +42,7 @@ stream: phosphorus project: "sxp" project-name: "sxp" - branch: "master" + branch: "stable/phosphorus" mvn-settings: "sxp-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 2f07ab50c..24c8c8e1e 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,32 @@ --- +- project: + name: transportpce-sulfur + 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: 240 + build-node: centos7-builder-4c-16g + parallel: true + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: "transportpce" + project-name: "transportpce" + stream: sulfur + 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-phosphorus jobs: @@ -17,7 +45,7 @@ project: "transportpce" project-name: "transportpce" stream: phosphorus - branch: "master" + branch: "stable/phosphorus" java-version: "openjdk11" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 40e9ceda7..28752cde1 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,9 +12,12 @@ # Project branches. stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "stable/silicon" jre: "openjdk11" diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 142d7e71a..18fca3375 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: "yangtools" stream: - - phosphorus: + - sulfur: branch: "master" jre: "openjdk11" + - phosphorus: + branch: "stable/phosphorus" + jre: "openjdk11" - silicon: branch: "6.0.x" jre: "openjdk11" -- 2.36.6