From e16eeb671244325770898746609db5df8bd67ce4 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 21 Apr 2022 12:29:00 +1000 Subject: [PATCH] Feat: Branch cut for stable/sulfur stream Move master to the next release (chlorine). Issue-ID: LF-JIRA RELENG-4123 Change-Id: I879c4d53d67f13dc510a8abf72464b998bf8a147 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-branch-lock.yaml | 4 +- 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 | 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/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 | 29 +++++++++++++- jjb/defaults.yaml | 17 +++++++++ jjb/dluxapps/dluxapps-csit-yangman.yaml | 5 ++- jjb/docs/docs-rtd.yaml | 4 +- jjb/integration/csit-jobs-chlorine.lst | 21 ++++++++++ jjb/integration/integration-test-jobs.yaml | 35 +++++++++++++++-- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 5 ++- jjb/jsonrpc/jsonrpc.yaml | 29 +++++++++++++- .../l2switch-csit-host-scalability-daily.yaml | 5 ++- jjb/l2switch/l2switch-csit-scalability.yaml | 5 ++- jjb/l2switch/l2switch-csit-switch.yaml | 5 ++- jjb/l2switch/l2switch-patch-test.yaml | 5 ++- .../lispflowmapping-csit-msmr.yaml | 5 ++- jjb/lispflowmapping/lispflowmapping.yaml | 36 +++++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 ++- jjb/mdsal/mdsal-csit-netty-replication.yaml | 11 +++++- jjb/neutron/neutron-patch-test.yaml | 4 +- jjb/odlmicro/odlmicro-csit.yaml | 38 +++++++++++++++++-- jjb/odlmicro/odlmicro.yaml | 21 +++++++++- 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 | 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/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/serviceutils/serviceutils-patch-test.yaml | 4 +- jjb/serviceutils/serviceutils.yaml | 36 +++++++++++++++++- jjb/sxp/sxp-csit-topology.yaml | 5 ++- jjb/transportpce/transportpce.yaml | 30 ++++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 5 ++- jjb/yangtools/yangtools-patch-test.yaml | 5 ++- 77 files changed, 651 insertions(+), 80 deletions(-) create mode 100644 jjb/integration/csit-jobs-chlorine.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 47ea576f4..a50867cd2 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 8917abc17..71ecff87f 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -7,9 +7,12 @@ project: "aaa" stream: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index fef79a6f7..5d8544ff0 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -1,4 +1,22 @@ --- +- project: + name: archetypes-chlorine + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: chlorine + 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-sulfur jobs: @@ -8,7 +26,7 @@ stream: sulfur project: "archetypes" project-name: "archetypes" - branch: "master" + branch: "stable/sulfur" 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-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 4fd72cdd0..9b5e63986 100644 --- a/jjb/autorelease/autorelease-branch-lock.yaml +++ b/jjb/autorelease/autorelease-branch-lock.yaml @@ -80,8 +80,10 @@ jobs: - "{project-name}-gerrit-branch-lock-{stream}" stream: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 2099daf2b..27cb24d30 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -13,9 +13,12 @@ - gerrit-tox-verify stream: - - sulfur: + - chlorine: branch: "master" integration-test: sulfur + - sulfur: + branch: "stable/sulfur" + integration-test: sulfur - phosphorus: branch: "stable/phosphorus" integration-test: phosphorus diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index bd9d0ae78..ca12adcdc 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: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index c67c52a0c..46df82696 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index c0ab7ca61..41535e56c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 71ae496b5..6d3fed52c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 38b3ec343..04e173352 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index cb7ded297..452b20815 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 0ce3aa460..c1b793d79 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index a78ed84f9..af305f57a 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 19be5fea0..d7a2658dd 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 92965a89a..839f983c0 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -11,9 +11,12 @@ functionality: "akka1" stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index e3e9e9a27..8c5aad9df 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,9 +12,12 @@ elasticsearch-attribute: "disabled" stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 784254de6..7b1a5799f 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 49f9c205f..3ea5e77ad 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" 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 8dfe6fece..da45b1c4c 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 6265325ae..bf279e55b 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 8bf68eb95..91cbfcea3 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 194841563..3ff6efb0a 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index daaef5d25..fef29c4cf 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 0b4444bd0..7ed846e68 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index c2858adcd..126207535 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" 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 5b5273306..c08b0e2ad 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 3e3b100be..9a7b7e9c9 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -7,9 +7,12 @@ project: "controller" stream: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index d164ad50f..3e4a6de67 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 63f8dc1bf..43809ca61 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 6b951e49f..852efcddd 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,31 @@ --- +- project: + name: daexim-chlorine + 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 + - odl-maven-verify-jobs-jdk17 + + project: "daexim" + project-name: "daexim" + stream: chlorine + branch: "master" + java-version: "openjdk11" + mvn-settings: "daexim-settings" + build-node: centos8-builder-4c-4g + 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-sulfur jobs: @@ -15,7 +42,7 @@ project: "daexim" project-name: "daexim" stream: sulfur - branch: "master" + branch: "stable/sulfur" java-version: "openjdk11" mvn-settings: "daexim-settings" build-node: centos8-builder-4c-4g diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index f4e51b17a..8fcde1b05 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -296,3 +296,20 @@ distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur csit-sanity-list-sulfur: > openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur + csit-mri-list-chlorine: > + aaa-csit-1node-authn-all-chlorine, controller-csit-1node-akka1-all-chlorine, + controller-csit-1node-benchmark-all-chlorine, controller-csit-1node-rest-cars-perf-all-chlorine, + controller-csit-3node-benchmark-all-chlorine, controller-csit-3node-clustering-ask-all-chlorine, + controller-csit-3node-clustering-tell-all-chlorine, controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine, + controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, mdsal-csit-3node-netty-replicate-only-chlorine, + 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-chlorine + csit-weekly-list-chlorine: > + controller-csit-1node-notifications-longevity-only-chlorine, controller-csit-3node-drb-partnheal-longevity-only-chlorine, + controller-csit-3node-drb-precedence-longevity-only-chlorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine, + bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, distribution-deploy-chlorine, + distribution-offline-chlorine, openflowplugin-csit-1node-longevity-only-chlorine + csit-sanity-list-chlorine: > + openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 4f736eebb..40c3dad8a 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 56c4ad9ac..440844c24 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/integration/csit-jobs-chlorine.lst b/jjb/integration/csit-jobs-chlorine.lst new file mode 100644 index 000000000..df9892a30 --- /dev/null +++ b/jjb/integration/csit-jobs-chlorine.lst @@ -0,0 +1,21 @@ +bgpcep-csit-1node-bgp-ingest-all-chlorine, +bgpcep-csit-1node-bgp-ingest-mixed-all-chlorine, +bgpcep-csit-1node-throughpcep-all-chlorine, +bgpcep-csit-1node-userfeatures-all-chlorine, +daexim-csit-1node-basic-only-chlorine, +daexim-csit-3node-clustering-basic-only-chlorine, +distribution-csit-managed-chlorine, +jsonrpc-csit-1node-basic-only-chlorine, +odltools-csit-1node-upstream-all-chlorine, +openflowplugin-csit-1node-cbench-only-chlorine, +openflowplugin-csit-1node-flow-services-all-chlorine, +openflowplugin-csit-1node-perf-bulkomatic-only-chlorine, +openflowplugin-csit-1node-perf-stats-collection-only-chlorine, +openflowplugin-csit-1node-scale-link-only-chlorine, +openflowplugin-csit-1node-scale-only-chlorine, +openflowplugin-csit-1node-scale-switch-only-chlorine, +openflowplugin-csit-3node-clustering-bulkomatic-only-chlorine, +openflowplugin-csit-3node-clustering-only-chlorine, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-chlorine, +ovsdb-csit-1node-upstream-southbound-all-chlorine, +ovsdb-csit-3node-upstream-clustering-only-chlorine, diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 17eb89ccb..b8996c102 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: - - sulfur: + - chlorine: branch: "master" mvn-version: "mvn35" java-version: "openjdk11" + csit-list: !include: csit-jobs-chlorine.lst + build-order: > + odlparent infrautils yangtools mdsal controller serviceutils aaa netconf + daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping + bgpcep integration/distribution + + - sulfur: + branch: "stable/sulfur" + mvn-version: "mvn35" + java-version: "openjdk11" csit-list: !include: csit-jobs-sulfur.lst build-order: > odlparent infrautils yangtools mdsal controller serviceutils aaa netconf @@ -61,8 +71,21 @@ # CSIT Lists in defaults.yaml stream: - - sulfur: + - chlorine: 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-chlorine.lst + csit-mri-list: "{csit-mri-list-chlorine}" + csit-weekly-list: "{csit-weekly-list-chlorine}" + - sulfur: + branch: "stable/sulfur" csit-blocklist: > aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools @@ -109,9 +132,13 @@ - "integration-sanity-test-{stream}" stream: - - sulfur: + - chlorine: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-chlorine}" + - sulfur: + branch: "stable/sulfur" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-sulfur}" - phosphorus: branch: "stable/phosphorus" @@ -164,7 +191,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 697fccb93..255f50984 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 9a815b508..1f5bb68d6 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,31 @@ --- +- project: + name: jsonrpc-chlorine + 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 + - odl-maven-verify-jobs-jdk17 + + project: "jsonrpc" + project-name: "jsonrpc" + stream: chlorine + java-version: "openjdk11" + branch: "master" + mvn-settings: "jsonrpc-settings" + build-node: centos8-builder-4c-4g + 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-sulfur jobs: @@ -16,7 +43,7 @@ project-name: "jsonrpc" stream: sulfur java-version: "openjdk11" - branch: "master" + branch: "stable/sulfur" mvn-settings: "jsonrpc-settings" build-node: centos8-builder-4c-4g mvn-opts: "-Xmx1024m" diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 916f0494d..9278dc455 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 4d7482a3c..fc4d46fc7 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 6ed3621c7..3bc53753f 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 4d8313801..160824f79 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -10,9 +10,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 7b40eea2f..e8a948b6b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index c77eefe68..eeb872db4 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,38 @@ --- +- project: + name: lispflowmapping-chlorine + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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 + - odl-maven-verify-jobs-jdk17 + + stream: chlorine + 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: centos8-builder-8c-8g + + # Used by the release job + staging-profile-id: 96fff2503b766 + - project: name: lispflowmapping-sulfur jobs: @@ -17,7 +51,7 @@ stream: sulfur project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/sulfur" 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 d0a5a4dbd..7022d10a6 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ functionality: "bindingv1" stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 457461772..1d010e256 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -12,7 +12,7 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" install-features: > @@ -21,6 +21,15 @@ odl-restconf-nb-bierman02, odl-netconf-clustered-topology, odl-clustering-test-app + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-restconf-nb-bierman02, + odl-netconf-clustered-topology, + odl-clustering-test-app - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 57df5370a..007a6cd01 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -7,8 +7,10 @@ project: "neutron" stream: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml index 505a3947d..a00459017 100644 --- a/jjb/odlmicro/odlmicro-csit.yaml +++ b/jjb/odlmicro/odlmicro-csit.yaml @@ -13,7 +13,7 @@ # Project branches. stream: - - sulfur: + - chlorine: 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 + - sulfur: + branch: "stable/sulfur" + 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 - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" @@ -59,7 +67,7 @@ # Project branches. stream: - - sulfur: + - chlorine: 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 + - sulfur: + branch: "stable/sulfur" + 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 - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" @@ -125,7 +145,7 @@ # Project branches. stream: - - sulfur: + - chlorine: 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 + - sulfur: + branch: "stable/sulfur" + 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 - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index ec132bdce..416529847 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -1,4 +1,23 @@ --- +- project: + name: odlmicro-chlorine + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: chlorine + 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-sulfur jobs: @@ -8,7 +27,7 @@ stream: sulfur project: odlmicro project-name: "odlmicro" - branch: "master" + branch: "stable/sulfur" java-version: "openjdk11" build-node: centos7-builder-2c-2g build-timeout: 60 diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index d8614e654..e4bbab998 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -1,4 +1,24 @@ --- +- project: + name: odlsaf-chlorine + jobs: + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: chlorine + 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-sulfur jobs: @@ -10,7 +30,7 @@ project-name: "odlsaf" build-node: centos7-builder-4c-4g build-timeout: 120 - branch: "master" + branch: "stable/sulfur" 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 83c6fa45f..be4537a0f 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -10,9 +10,12 @@ testplan: "{project}-basic.txt" stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index ace2a005a..18a1d929e 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -8,8 +8,10 @@ jdk: openjdk8 stream: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 04a1a9acd..4e4c3f962 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 3ae70ec4c..dda4a0238 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 72ea2dec3..007d66ab8 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 2c96b68e1..55d1a853c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index b1b92d5b5..e1d5b0bdf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,10 +14,14 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" install: "all" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" + install: "all" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 3691ceb66..f558837c6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -16,9 +16,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 3c9536a32..dfe8d352e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 6876ce0f9..6a26aef32 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: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 6e2214cb0..048da8855 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 3f482ea42..4eac30840 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 02faaff4c..4ff61cf59 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index beeb2a5fb..8f90fc716 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 403ef0953..8aafddc1a 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 56c15e015..450053d58 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,38 @@ --- +- project: + name: openflowplugin-chlorine + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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 + - odl-maven-verify-jobs-jdk17 + + stream: chlorine + project: "openflowplugin" + project-name: "openflowplugin" + branch: "master" + build-node: centos8-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-sulfur jobs: @@ -18,7 +52,7 @@ stream: sulfur project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/sulfur" build-node: centos8-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 528aa400f..80764c501 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index ea353fb7e..f0b2e71b6 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 1953d9222..6c9c8213d 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: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index eef2ef960..c331a9107 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: "ovsdb" stream: - - sulfur: + - chlorine: branch: "master" java-version: "openjdk11" + - sulfur: + branch: "stable/sulfur" + java-version: "openjdk11" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 13e6acfe2..58709ec73 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ovsdb-chlorine + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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: chlorine + 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-sulfur jobs: @@ -16,7 +43,7 @@ stream: sulfur project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/sulfur" 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 7bd3b90a5..3d984b3d8 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -1,4 +1,23 @@ --- +- project: + name: p4plugin-chlorine + jobs: + - "{project-name}-maven-javadoc-jobs" + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: chlorine + 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-sulfur jobs: @@ -9,7 +28,7 @@ stream: sulfur project: "p4plugin" project-name: "p4plugin" - branch: "master" + branch: "stable/sulfur" 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 a10f2e114..1d241209d 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -7,8 +7,10 @@ project: "serviceutils" stream: - - sulfur: + - chlorine: branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - silicon: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 2c0c4cb3e..aad9dfb54 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-sulfur + name: serviceutils-chlorine jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs": @@ -15,6 +15,40 @@ - odl-maven-verify-jobs-jdk17 branch: "master" + stream: chlorine + + project: "serviceutils" + project-name: "serviceutils" + build-node: centos8-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-sulfur + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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 + - odl-maven-verify-jobs-jdk17 + + branch: "stable/sulfur" stream: sulfur project: "serviceutils" diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 63e4fcecf..5d3102063 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index f7a11593b..eec62f779 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,32 @@ --- +- project: + name: transportpce-chlorine + 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: 360 + build-node: centos7-builder-4c-16g + parallel: true + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: "transportpce" + project-name: "transportpce" + stream: chlorine + 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-sulfur jobs: @@ -17,7 +45,7 @@ project: "transportpce" project-name: "transportpce" stream: sulfur - branch: "master" + branch: "stable/sulfur" 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 c47acfd1d..78549965e 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -12,9 +12,12 @@ # Project branches. stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index ea488023f..c59532580 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -7,9 +7,12 @@ project: "yangtools" stream: - - sulfur: + - chlorine: branch: "master" jre: "openjdk11" + - sulfur: + branch: "stable/sulfur" + jre: "openjdk11" - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" -- 2.36.6