From 309f2c1cdb95fc43d9e31ae28b6b2418f15f24db Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 9 Apr 2024 21:47:15 +1000 Subject: [PATCH] Feat: Branch cut stable/calcium Branch cut stable/calcium and promote master to scandium. Issue: LF-JIRA RELENG-5262 Change-Id: Ibb8179710e8968cf11f9166d61778eabbe89f5ec Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 4 ++- jjb/autorelease/autorelease-branch-lock.yaml | 4 ++- jjb/autorelease/autorelease-projects.yaml | 9 +++-- .../autorelease-version-management.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 4 ++- .../bgpcep-csit-bgpclustering-longevity.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 4 ++- jjb/controller/controller-csit-akka1.yaml | 4 ++- .../controller-csit-clustering.yaml | 4 ++- .../controller-csit-cs-chasing-leader.yaml | 4 ++- .../controller-csit-cs-partnheal.yaml | 4 ++- ...ontroller-csit-ddb-expl-lead-movement.yaml | 4 ++- .../controller-csit-dnb-noloss.yaml | 4 ++- .../controller-csit-drb-partnheal.yaml | 4 ++- .../controller-csit-drb-precedence.yaml | 4 ++- .../controller-csit-dsbenchmark-cluster.yaml | 4 ++- .../controller-csit-dsbenchmark.yaml | 4 ++- .../controller-csit-rest-cars-perf.yaml | 4 ++- .../controller-csit-rest-clust-cars-perf.yaml | 4 ++- jjb/daexim/daexim-csit-basic.yaml | 4 ++- jjb/daexim/daexim-csit-clustering-basic.yaml | 4 ++- jjb/daexim/daexim.yaml | 25 ++++++++++++- jjb/defaults.yaml | 27 ++++++++++++++ jjb/docs/docs-rtd.yaml | 4 ++- jjb/integration/csit-jobs-scandium.lst | 20 +++++++++++ jjb/integration/integration-test-jobs.yaml | 30 ++++++++++++++-- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 4 ++- jjb/jsonrpc/jsonrpc.yaml | 25 ++++++++++++- .../lispflowmapping-csit-msmr.yaml | 4 ++- jjb/lispflowmapping/lispflowmapping.yaml | 35 ++++++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 4 ++- jjb/mdsal/mdsal-csit-netty-replication.yaml | 9 ++++- .../openflowplugin-csit-cbench.yaml | 4 ++- ...flowplugin-csit-clustering-bulkomatic.yaml | 4 ++- ...lugin-csit-clustering-perf-bulkomatic.yaml | 4 ++- .../openflowplugin-csit-clustering.yaml | 4 ++- .../openflowplugin-csit-flow-services.yaml | 4 ++- .../openflowplugin-csit-longevity.yaml | 4 ++- .../openflowplugin-csit-perf-bulkomatic.yaml | 4 ++- ...flowplugin-csit-perf-stats-collection.yaml | 4 ++- .../openflowplugin-csit-sanity.yaml | 4 ++- .../openflowplugin-csit-scale-link.yaml | 4 ++- .../openflowplugin-csit-scale-switch.yaml | 4 ++- .../openflowplugin-csit-scale.yaml | 4 ++- .../openflowplugin-patch-test.yaml | 4 ++- jjb/openflowplugin/openflowplugin.yaml | 34 +++++++++++++++++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 ++- jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 ++- jjb/ovsdb/ovsdb-full-integration.yaml | 4 ++- jjb/ovsdb/ovsdb-patch-test.yaml | 4 ++- jjb/ovsdb/ovsdb.yaml | 28 ++++++++++++++- jjb/packaging/helm.yaml | 4 ++- jjb/serviceutils/serviceutils-patch-test.yaml | 4 ++- jjb/serviceutils/serviceutils.yaml | 34 +++++++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 4 ++- 59 files changed, 408 insertions(+), 60 deletions(-) create mode 100644 jjb/integration/csit-jobs-scandium.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index d16065d5e..cf860ee0d 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 0dd616194..fca05110e 100644 --- a/jjb/autorelease/autorelease-branch-lock.yaml +++ b/jjb/autorelease/autorelease-branch-lock.yaml @@ -88,8 +88,10 @@ jobs: - "{project-name}-gerrit-branch-lock-{stream}" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index d58bbf447..85935b18f 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -9,8 +9,10 @@ - gerrit-tox-verify stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: @@ -33,9 +35,12 @@ - "autorelease-generate-release-notes-{stream}" stream: - - calcium: + - scandium: branch: "master" integration-test: calcium + - calcium: + branch: "stable/calcium" + integration-test: calcium - potassium: branch: "stable/potassium" integration-test: potassium diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 183e0e703..f87225c2a 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: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 22ec0d196..caf633500 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index fdfe7f48b..4b731bdcd 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 64790eb84..858d6d08a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index ff59f3d6b..b0fe8ee97 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index fc8359e86..6fccacaf8 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index b4bfc3205..30e17aa24 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 1c3858002..2f527a63a 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index bae98c1b2..78c2ece9b 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -12,8 +12,10 @@ functionality: "akka1" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 27ff48158..3328d4c21 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,8 +13,10 @@ elasticsearch-attribute: "disabled" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 9109e34a4..c673ff87e 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 7455d93a2..25e1a3adf 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 9d22eb5f5..241ec4554 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index abc20191e..25a03e8db 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index bf635321b..0177e7d0f 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index d5578b254..98c560460 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 9974100fc..64248d043 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index e690e28c8..f4ccc061b 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 7ac24cd1c..b7528c1e9 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index f804a10fc..9c7ee3aca 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 68962f9ea..3059b71c8 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index c4a7fe5b4..6188e35db 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index ed3b8f1ea..92d3a94b5 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,27 @@ --- +- project: + name: daexim-scandium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: daexim + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ + rtd-token: 76284f12638574f131cdccdf257d852d07c195fc + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "daexim" + project-name: "daexim" + stream: scandium + branch: "master" + mvn-settings: "daexim-settings" + 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-calcium jobs: @@ -14,7 +37,7 @@ project: "daexim" project-name: "daexim" stream: calcium - branch: "master" + branch: "stable/calcium" mvn-settings: "daexim-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 0120bec2d..045baf77b 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -299,3 +299,30 @@ csit-sanity-list-calcium: > openflowplugin-csit-1node-sanity-only-calcium, distribution-sanity-calcium + csit-mri-list-scandium: > + aaa-csit-1node-authn-all-scandium, + controller-csit-1node-akka1-all-scandium, + controller-csit-1node-benchmark-all-scandium, + controller-csit-1node-rest-cars-perf-all-scandium, + controller-csit-3node-benchmark-all-scandium, + controller-csit-3node-clustering-ask-all-scandium, + controller-csit-3node-clustering-tell-all-scandium, + controller-csit-3node-rest-clust-cars-perf-ask-only-scandium, + controller-csit-3node-rest-clust-cars-perf-tell-only-scandium, + mdsal-csit-3node-netty-replicate-only-scandium, + 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-3node-clustering-only-master, + netconf-csit-3node-clustering-scale-only-master, + yangtools-csit-1node-system-only-scandium + csit-weekly-list-scandium: > + controller-csit-1node-notifications-longevity-only-scandium, + controller-csit-3node-drb-partnheal-longevity-only-scandium, + controller-csit-3node-drb-precedence-longevity-only-scandium, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-scandium, + bgpcep-csit-3node-bgpclustering-longevity-only-scandium, + openflowplugin-csit-1node-longevity-only-scandium + csit-sanity-list-scandium: > + openflowplugin-csit-1node-sanity-only-scandium, distribution-sanity-scandium diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 3c036a853..18ec7dbc8 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/integration/csit-jobs-scandium.lst b/jjb/integration/csit-jobs-scandium.lst new file mode 100644 index 000000000..693e09630 --- /dev/null +++ b/jjb/integration/csit-jobs-scandium.lst @@ -0,0 +1,20 @@ +bgpcep-csit-1node-bgp-ingest-all-scandium, +bgpcep-csit-1node-bgp-ingest-mixed-all-scandium, +bgpcep-csit-1node-throughpcep-all-scandium, +bgpcep-csit-1node-userfeatures-all-scandium, +daexim-csit-1node-basic-only-scandium, +daexim-csit-3node-clustering-basic-only-scandium, +distribution-csit-managed-scandium, +jsonrpc-csit-1node-basic-only-scandium, +openflowplugin-csit-1node-cbench-only-scandium, +openflowplugin-csit-1node-flow-services-all-scandium, +openflowplugin-csit-1node-perf-bulkomatic-only-scandium, +openflowplugin-csit-1node-perf-stats-collection-only-scandium, +openflowplugin-csit-1node-scale-link-only-scandium, +openflowplugin-csit-1node-scale-only-scandium, +openflowplugin-csit-1node-scale-switch-only-scandium, +openflowplugin-csit-3node-clustering-bulkomatic-only-scandium, +openflowplugin-csit-3node-clustering-only-scandium, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-scandium, +ovsdb-csit-1node-upstream-southbound-all-scandium, +ovsdb-csit-3node-upstream-clustering-only-scandium, diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 9041340e0..9c395414e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -21,8 +21,15 @@ # CSIT Lists in defaults.yaml stream: - - calcium: + - scandium: branch: "master" + csit-list: !include: csit-jobs-scandium.lst + build-order: > + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution + - calcium: + branch: "stable/calcium" csit-list: !include: csit-jobs-calcium.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep @@ -55,8 +62,21 @@ # CSIT Lists in defaults.yaml stream: - - calcium: + - scandium: branch: "master" + csit-blocklist: > + aaa controller genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp 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-scandium.lst + csit-mri-list: "{csit-mri-list-scandium}" + csit-weekly-list: "{csit-weekly-list-scandium}" + - calcium: + branch: "stable/calcium" csit-blocklist: > aaa controller genius lispflowmapping l2switch mdsal netconf netvirt odlmicro sxp yangtools @@ -103,9 +123,13 @@ - "integration-sanity-test-{stream}" stream: - - calcium: + - scandium: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-scandium}" + - calcium: + branch: "stable/calcium" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-calcium}" - potassium: branch: "stable/potassium" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index dcc063478..1b18f0010 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 1db37039a..2f7431d59 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,27 @@ --- +- project: + name: jsonrpc-scandium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: jsonrpc + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ + rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "jsonrpc" + project-name: "jsonrpc" + stream: scandium + branch: "master" + mvn-settings: "jsonrpc-settings" + 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-calcium jobs: @@ -14,7 +37,7 @@ project: "jsonrpc" project-name: "jsonrpc" stream: calcium - branch: "master" + branch: "stable/calcium" mvn-settings: "jsonrpc-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 1a4fcf79d..f91440b81 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index ea09f9b43..81d62521f 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,37 @@ --- +- project: + name: lispflowmapping-scandium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + java-version: openjdk17 + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: lispflowmapping + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ + rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: scandium + project: "lispflowmapping" + project-name: "lispflowmapping" + branch: "master" + 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-calcium jobs: @@ -17,7 +50,7 @@ stream: calcium project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/calcium" mvn-settings: "lispflowmapping-settings" mvn-goals: "clean deploy -DrepoBuild" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index e2fd772ce..4cea6652c 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -13,8 +13,10 @@ functionality: "bindingv1" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 95d177541..9cb6c101c 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -13,13 +13,20 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" install-features: > features-controller, odl-mdsal-replicate-netty, odl-netconf-clustered-topology, odl-clustering-test-app + - calcium: + branch: "stable/calcium" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-netconf-clustered-topology, + odl-clustering-test-app - potassium: branch: "stable/potassium" install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 1cbf51674..4cd4a5bfd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 624a8c8f6..76a8d750a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 89ddb8202..e4fb74490 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 28f717ef8..366268556 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 3a666bdc3..eded3b6bf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 080d161f9..ee50db3ee 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -17,8 +17,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index ee57079af..b18dd0625 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index aaaad52bf..d11f7356d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 44ee6c565..25878e5f9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 57145bec7..22ea337d0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index b9ad26bc4..602383251 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index df1ad7706..bf48db257 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 938619381..92a5a319e 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -10,8 +10,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 20ab92e58..e12f69d22 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,36 @@ --- +- project: + name: openflowplugin-scandium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + java-version: openjdk17 + - "{project-name}-rtd-jobs": + build-node: centos8-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-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: scandium + project: "openflowplugin" + project-name: "openflowplugin" + branch: "master" + build-timeout: 90 + 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-calcium jobs: @@ -18,7 +50,7 @@ stream: calcium project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/calcium" build-timeout: 90 mvn-settings: "openflowplugin-settings" mvn-goals: "clean deploy javadoc:aggregate" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 2fa7ffe2a..c92ad4d6f 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 89eaabe68..3d4886e3e 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 1fb06f623..227abbf36 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,8 +5,10 @@ - "ovsdb-daily-full-integration-{stream}" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 080c4175a..13269a466 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -9,8 +9,10 @@ mvn-version: "mvn38" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index b4b60443e..975de4fb3 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,30 @@ --- +- project: + name: ovsdb-scandium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + java-version: openjdk17 + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: ovsdb + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ + rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: scandium + project: "ovsdb" + project-name: "ovsdb" + branch: "master" + 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-calcium jobs: @@ -17,7 +43,7 @@ stream: calcium project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/calcium" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]" diff --git a/jjb/packaging/helm.yaml b/jjb/packaging/helm.yaml index 280c37f50..aa0eab2d4 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -304,8 +304,10 @@ helm3.7 package . stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index ebd35e746..532b23071 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -8,8 +8,10 @@ mvn-version: "mvn38" stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index b1dc179ea..77234e8f0 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-calcium + name: serviceutils-scandium jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs": @@ -15,6 +15,38 @@ - odl-maven-verify-jobs-jdk17 branch: "master" + stream: scandium + + project: "serviceutils" + project-name: "serviceutils" + build-node: centos8-builder-2c-2g + mvn-settings: "serviceutils-settings" + 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-calcium + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + java-version: openjdk17 + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: serviceutils + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/ + rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4 + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + branch: "stable/calcium" stream: calcium project: "serviceutils" diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index f8e47ea78..2673efa93 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,8 +13,10 @@ # Project branches. stream: - - calcium: + - scandium: branch: "master" + - calcium: + branch: "stable/calcium" - potassium: branch: "stable/potassium" - argon: -- 2.36.6