From 428fa6e554c5a583b8aacd650e9277d4b7f2dcef Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 14 Aug 2024 17:49:17 +1000 Subject: [PATCH] Feat: Branch cut stable/scandium Branch cut stable/scandium and promote 'master' to titanium. Issue: LF-JIRA RELENG-5553 Change-Id: I9fadb65aa60fc9e5b89d220c35f769722e379815 Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- jjb/aaa/aaa-csit-authn.yaml | 4 +- jjb/autorelease/autorelease-branch-lock.yaml | 4 +- jjb/autorelease/autorelease-projects.yaml | 14 +++- .../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 | 26 +++++- jjb/defaults.yaml | 31 ++++++- jjb/docs/docs-rtd.yaml | 4 +- jjb/integration/csit-jobs-titanium.lst | 20 +++++ .../distribution/distribution-jobs.yaml | 4 +- jjb/integration/integration-test-jobs.yaml | 30 ++++++- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 4 +- jjb/jsonrpc/jsonrpc.yaml | 26 +++++- .../lispflowmapping-csit-msmr.yaml | 4 +- jjb/lispflowmapping/lispflowmapping.yaml | 32 +++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 4 +- jjb/mdsal/mdsal-csit-netty-replication.yaml | 9 ++- jjb/netconf/netconf-clustering-scale.yaml | 5 +- jjb/netconf/netconf-clustering.yaml | 5 +- jjb/netconf/netconf-csit-callhome.yaml | 5 +- .../netconf-distribution-mri-test.yaml | 4 +- jjb/netconf/netconf-scale.yaml | 7 +- jjb/netconf/netconf-userfeatures.yaml | 5 +- .../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 | 33 +++++++- 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 | 27 ++++++- jjb/packaging/helm.yaml | 4 +- jjb/serviceutils/serviceutils-patch-test.yaml | 4 +- jjb/serviceutils/serviceutils.yaml | 33 +++++++- jjb/transportpce/transportpce-models.yaml | 72 +++++++++++++++++ jjb/transportpce/transportpce.yaml | 81 +++++++------------ jjb/yangtools/yangtools-csit-system.yaml | 4 +- 68 files changed, 536 insertions(+), 125 deletions(-) create mode 100644 jjb/integration/csit-jobs-titanium.lst create mode 100644 jjb/transportpce/transportpce-models.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index b2029a98e2..9542d00ccb 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index df19755bf5..820279e48d 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 4aecc36efe..11c6c37650 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -9,8 +9,10 @@ - gerrit-tox-verify stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: @@ -29,15 +31,19 @@ jobs: - "autorelease-release-{stream}-{mvn-version}-{java-version}": build-node: ubuntu2004-docker-8c-8g - - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}": - build-node: centos8-builder-2c-8g + - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}" - "autorelease-generate-release-notes-{stream}" stream: - - scandium: + - titanium: branch: "master" java-version: openjdk21 mvn-version: mvn39 + integration-test: titanium + - scandium: + branch: "stable/scandium" + java-version: openjdk21 + mvn-version: mvn39 integration-test: scandium - calcium: branch: "stable/calcium" diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 35afd7ae34..8993a53660 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index c2ab3c5eaa..307c268b0f 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 05a71472f9..0f00158f3e 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 6679972392..5acc1b2ede 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 96a5538630..8f40e42c9c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index ca43b4369c..0bad47c911 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index d40db5166c..cc85fd8a29 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 494f81885d..e771c560e5 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 09547813ac..60dd37bc93 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -12,8 +12,10 @@ functionality: "akka1" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 5b778a54d9..d4e03468be 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,8 +13,10 @@ elasticsearch-attribute: "disabled" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index f1eb5abce8..be9c1ae5bd 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index f946a66c53..60e1ecd0fa 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index b1ff2f623c..e3681bd19a 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 938b718b3d..6eed5ce1fc 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 6afe53fb2b..0bf2597924 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 941a996116..5786bc3525 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 4fccc963a4..149fc08311 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 337fef7301..d86adffacb 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index c5a727a4da..ea6cad7a4e 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 14ee52d0e8..c6d64f6f69 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 4d8c082f3e..14fa33231d 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 14836acca5..2a00a716bb 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 0d36f9e3aa..9437536ba2 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,28 @@ --- +- project: + name: daexim-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: "daexim" + project-name: "daexim" + stream: titanium + branch: "master" + build-node: ubuntu2004-docker-4c-4g + 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-scandium jobs: @@ -14,7 +38,7 @@ project: "daexim" project-name: "daexim" stream: scandium - branch: "master" + branch: "stable/scandium" build-node: ubuntu2004-docker-4c-4g mvn-settings: "daexim-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index ad6c2eede7..52683c247d 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -296,4 +296,33 @@ 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 + openflowplugin-csit-1node-sanity-only-scandium, + distribution-sanity-scandium + csit-mri-list-titanium: > + aaa-csit-1node-authn-all-titanium, + controller-csit-1node-akka1-all-titanium, + controller-csit-1node-benchmark-all-titanium, + controller-csit-1node-rest-cars-perf-all-titanium, + controller-csit-3node-benchmark-all-titanium, + controller-csit-3node-clustering-ask-all-titanium, + controller-csit-3node-clustering-tell-all-titanium, + controller-csit-3node-rest-clust-cars-perf-ask-only-titanium, + controller-csit-3node-rest-clust-cars-perf-tell-only-titanium, + mdsal-csit-3node-netty-replicate-only-titanium, + netconf-csit-1node-callhome-only-titanium, + netconf-csit-1node-scale-max-devices-only-titanium, + netconf-csit-1node-scale-only-titanium, + netconf-csit-1node-userfeatures-all-titanium, + netconf-csit-3node-clustering-only-titanium, + netconf-csit-3node-clustering-scale-only-titanium, + yangtools-csit-1node-system-only-titanium + csit-weekly-list-titanium: > + controller-csit-1node-notifications-longevity-only-titanium, + controller-csit-3node-drb-partnheal-longevity-only-titanium, + controller-csit-3node-drb-precedence-longevity-only-titanium, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-titanium, + bgpcep-csit-3node-bgpclustering-longevity-only-titanium, + openflowplugin-csit-1node-longevity-only-titanium + csit-sanity-list-titanium: > + openflowplugin-csit-1node-sanity-only-titanium, + distribution-sanity-titanium diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index ac6152a710..03bd138baf 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/integration/csit-jobs-titanium.lst b/jjb/integration/csit-jobs-titanium.lst new file mode 100644 index 0000000000..786b19d35b --- /dev/null +++ b/jjb/integration/csit-jobs-titanium.lst @@ -0,0 +1,20 @@ +bgpcep-csit-1node-bgp-ingest-all-titanium, +bgpcep-csit-1node-bgp-ingest-mixed-all-titanium, +bgpcep-csit-1node-throughpcep-all-titanium, +bgpcep-csit-1node-userfeatures-all-titanium, +daexim-csit-1node-basic-only-titanium, +daexim-csit-3node-clustering-basic-only-titanium, +distribution-csit-managed-titanium, +jsonrpc-csit-1node-basic-only-titanium, +openflowplugin-csit-1node-cbench-only-titanium, +openflowplugin-csit-1node-flow-services-all-titanium, +openflowplugin-csit-1node-perf-bulkomatic-only-titanium, +openflowplugin-csit-1node-perf-stats-collection-only-titanium, +openflowplugin-csit-1node-scale-link-only-titanium, +openflowplugin-csit-1node-scale-only-titanium, +openflowplugin-csit-1node-scale-switch-only-titanium, +openflowplugin-csit-3node-clustering-bulkomatic-only-titanium, +openflowplugin-csit-3node-clustering-only-titanium, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-titanium, +ovsdb-csit-1node-upstream-southbound-all-titanium, +ovsdb-csit-3node-upstream-clustering-only-titanium, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 55cfe7e8ee..03b6695861 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -26,8 +26,10 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/calcium" - calcium: branch: "stable/calcium" mvn-version: mvn38 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index a3fbdee015..097942c88b 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: - - scandium: + - titanium: branch: "master" + csit-list: !include: csit-jobs-titanium.lst + build-order: > + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution + - scandium: + branch: "stable/scandium" csit-list: !include: csit-jobs-scandium.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep @@ -55,8 +62,21 @@ # CSIT Lists in defaults.yaml stream: - - scandium: + - titanium: 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-titanium.lst + csit-mri-list: "{csit-mri-list-titanium}" + csit-weekly-list: "{csit-weekly-list-titanium}" + - scandium: + branch: "stable/scandium" csit-blocklist: > aaa controller genius lispflowmapping l2switch mdsal netconf netvirt odlmicro sxp yangtools @@ -103,9 +123,13 @@ - "integration-sanity-test-{stream}" stream: - - scandium: + - titanium: branch: "master" karaf-version: karaf4 + csit-sanity-list: "{csit-sanity-list-titanium}" + - scandium: + branch: "stable/scandium" + karaf-version: karaf4 csit-sanity-list: "{csit-sanity-list-scandium}" - calcium: branch: "stable/calcium" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 1f8afc0830..b857118bdc 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index a1e7a1f48d..6efa1aac11 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,28 @@ --- +- project: + name: jsonrpc-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: "jsonrpc" + project-name: "jsonrpc" + stream: titanium + branch: "master" + build-node: ubuntu2004-docker-4c-4g + 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-scandium jobs: @@ -14,7 +38,7 @@ project: "jsonrpc" project-name: "jsonrpc" stream: scandium - branch: "master" + branch: "stable/scandium" build-node: ubuntu2004-docker-4c-4g mvn-settings: "jsonrpc-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 607518a43d..7c6a6058a7 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index fa03634c16..f1a1f93259 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,34 @@ --- +- project: + name: lispflowmapping-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-javadoc-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + stream: titanium + project: "lispflowmapping" + project-name: "lispflowmapping" + branch: "master" + build-node: ubuntu2004-docker-8c-8g + 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 + + # Used by the release job + staging-profile-id: 96fff2503b766 + - project: name: lispflowmapping-scandium jobs: @@ -15,7 +45,7 @@ stream: scandium project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/scandium" build-node: ubuntu2004-docker-8c-8g 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 c571c7726c..707454b97c 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -13,8 +13,10 @@ functionality: "bindingv1" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index e154c780ce..8f5655d595 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -13,13 +13,20 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" install-features: > features-controller, odl-mdsal-replicate-netty, odl-netconf-clustered-topology, odl-clustering-test-app + - scandium: + branch: "stable/scandium" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-netconf-clustered-topology, + odl-clustering-test-app - calcium: branch: "stable/calcium" install-features: > diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index c84af188e9..57b432d599 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" jre: "openjdk21" + - scandium: + branch: "stable/scandium" + jre: "openjdk21" - calcium: branch: "7.0.x" jre: "openjdk17" diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 4fa80b3fe0..5949e933fd 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" jre: "openjdk21" + - scandium: + branch: "stable/scandium" + jre: "openjdk21" - calcium: branch: "7.0.x" jre: "openjdk17" diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index f0d36fcaa9..b8a068ea15 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" jre: "openjdk21" + - scandium: + branch: "stable/scandium" + jre: "openjdk21" - calcium: branch: "7.0.x" jre: "openjdk17" diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml index 0c3c2ad2d5..fb53a3571c 100644 --- a/jjb/netconf/netconf-distribution-mri-test.yaml +++ b/jjb/netconf/netconf-distribution-mri-test.yaml @@ -7,8 +7,10 @@ project: "netconf" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "7.0.x" - potassium: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index cef00aef23..41f3029c1c 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" jre: "openjdk21" + - scandium: + branch: "stable/scandium" + jre: "openjdk21" - calcium: branch: "7.0.x" jre: "openjdk17" @@ -56,7 +59,7 @@ stream: - master: branch: "master" - jre: "openjdk21" + jre: "openjdk17" robot-options: "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\ \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\ diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 76c5b9da25..42e22c382a 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" jre: "openjdk21" + - scandium: + branch: "stable/scandium" + jre: "openjdk21" - calcium: branch: "7.0.x" jre: "openjdk17" diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 8ab40da84d..2b630deb23 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 1cf407dd1a..497e394e0d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 9ad79350b8..8df1dacf78 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 6042f5db95..11da17908f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 93b4fd5d85..73d27eb0de 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 85c110eaa5..1c30eb55b3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -17,8 +17,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index f82db66e1a..c12e215730 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 5258d34b1a..33e04d49b1 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index b4642e9b2d..8ff16fed3c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index a88903205c..e1d95870af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index b1a138ce4f..e2863b8dfe 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 5443cd8b3e..a448de5b3e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 9e10b69a5b..16e7b4ef1c 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -10,8 +10,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 7101f481d8..48083d450c 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,35 @@ --- +- project: + name: openflowplugin-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-javadoc-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + stream: titanium + project: "openflowplugin" + project-name: "openflowplugin" + branch: "master" + build-node: ubuntu2004-docker-4c-4g + 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-scandium jobs: @@ -16,7 +47,7 @@ stream: scandium project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/scandium" build-node: ubuntu2004-docker-4c-4g build-timeout: 90 mvn-settings: "openflowplugin-settings" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e1816ff546..f89ff7a348 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 0b6566aabc..ce63c6c07b 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 15245dcf7c..28b13448b0 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: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 92317a5a16..15e47088ba 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -9,8 +9,10 @@ mvn-version: "mvn38" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 531a88c544..e5aafb3154 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,29 @@ --- +- project: + name: ovsdb-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-javadoc-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + stream: titanium + project: "ovsdb" + project-name: "ovsdb" + branch: "master" + build-node: ubuntu2004-docker-4c-4g + 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-scandium jobs: @@ -15,7 +40,7 @@ stream: scandium project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/scandium" build-node: ubuntu2004-docker-4c-4g mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" diff --git a/jjb/packaging/helm.yaml b/jjb/packaging/helm.yaml index 7767b4652c..48ae4af5b0 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -304,8 +304,10 @@ helm3.7 package . stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index ff5fc8309a..71ec5db8a7 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -8,8 +8,10 @@ mvn-version: "mvn38" stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 6d99e417b9..39b2af9331 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,4 +1,35 @@ --- +- project: + name: serviceutils-titanium + jobs: + - "{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 + - distribution-check-jobs-jdk21 + - odl-maven-javadoc-jobs-jdk21 + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: serviceutils + project-name: serviceutils + stream: titanium + branch: master + build-node: ubuntu2004-docker-2c-2g + build-timeout: 90 + + mvn-settings: "serviceutils-settings" + + 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-scandium jobs: @@ -15,7 +46,7 @@ project: serviceutils project-name: serviceutils stream: scandium - branch: master + branch: stable/scandium build-node: ubuntu2004-docker-2c-2g build-timeout: 90 diff --git a/jjb/transportpce/transportpce-models.yaml b/jjb/transportpce/transportpce-models.yaml new file mode 100644 index 0000000000..0f2f890299 --- /dev/null +++ b/jjb/transportpce/transportpce-models.yaml @@ -0,0 +1,72 @@ +--- +- project: + name: transportpce-models-master + jobs: + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: "transportpce/models" + project-name: "transportpce-models" + stream: master + branch: "master" + build-node: ubuntu2004-docker-2c-2g + 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-models-scandium + jobs: + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: "transportpce/models" + project-name: "transportpce-models" + stream: scandium + branch: "stable/scandium" + build-node: centos8-builder-2c-2g + 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-models-calcium + jobs: + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "transportpce/models" + project-name: "transportpce-models" + stream: calcium + branch: "stable/calcium" + build-node: centos8-builder-2c-2g + 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-models-potassium + jobs: + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "transportpce/models" + project-name: "transportpce-models" + stream: potassium + branch: "stable/potassium" + build-node: centos8-builder-2c-2g + 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 diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 1cb58c389d..8a523a29c5 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -25,6 +25,33 @@ # Used by the release job staging-profile-id: a6927323fa3d4 +- project: + name: transportpce-scandium + jobs: + - "{project-name}-rtd-jobs": + 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: ubuntu2004-docker-4c-16g + parallel: true + - odl-maven-jobs-jdk21 + - odl-maven-verify-jobs-jdk21 + + project: "transportpce" + project-name: "transportpce" + stream: scandium + branch: "stable/scandium" + build-node: ubuntu2004-docker-4c-4g + 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-calcium jobs: @@ -116,57 +143,3 @@ views: - project-view project-name: transportpce - -- project: - name: transportpce-models-master - jobs: - - odl-maven-jobs-jdk21 - - odl-maven-verify-jobs-jdk21 - - project: "transportpce/models" - project-name: "transportpce-models" - stream: master - branch: "master" - build-node: ubuntu2004-docker-2c-2g - 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-models-calcium - jobs: - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce/models" - project-name: "transportpce-models" - stream: calcium - branch: "stable/calcium" - build-node: centos8-builder-2c-2g - 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-models-potassium - jobs: - - odl-maven-jobs-jdk17 - - odl-maven-verify-jobs-jdk17 - - project: "transportpce/models" - project-name: "transportpce-models" - stream: potassium - branch: "stable/potassium" - build-node: centos8-builder-2c-2g - 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 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index a55ac39304..dbd03c1318 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,8 +13,10 @@ # Project branches. stream: - - scandium: + - titanium: branch: "master" + - scandium: + branch: "stable/scandium" - calcium: branch: "stable/calcium" - potassium: