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 <[email protected]>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index d16065d5ea7f98a6fc23deb47233d813a8332e28..cf860ee0d095038457fb037e386e19b0e016d519 100644 (file)
--- 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 0dd616194d32ede54846d13445bab1a846b8f59b..fca05110e1b8bb26c364c5fa9b9e75c5bf76a0e6 100644 (file)
--- 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 d58bbf447ffcddc689ece334170733d24b8ab6f2..85935b18f1ff4d63fb74e891069305bbb81ab23b 100644 (file)
--- 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 183e0e7038cf8b21f715400bcbc5f2595a45c243..f87225c2a5923509e6e1240e5589a7290b920ac9 100644 (file)
--- 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 22ec0d196e5b19bffb1bf0b1d1ec8a2df2511fd9..caf633500e7b4f1a0eec52a8ce3d894ca2c72e06 100644 (file)
--- 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 fdfe7f48ba6fd7e672473c76771de0a10883dacc..4b731bdcdf5dcba22dfba948162284c6be19bd16 100644 (file)
--- 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 64790eb849cad2e532785264f08f08df8d97a8b5..858d6d08ad0c3e5b2f0213e4fd61ee06f1443a90 100644 (file)
--- 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 ff59f3d6ba9e06fe45a28e166b6fd2fb40d12102..b0fe8ee97ad9fa194606cba6a4f327dde5f63504 100644 (file)
--- 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 fc8359e8649b015f80f058ca69a0033d5507f554..6fccacaf88c1abe8fde445caeb706f58c6c66cde 100644 (file)
--- 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 b4bfc320559d71bddc2df419e9bbb353f21c28d8..30e17aa24cc8c7ef785d901097af4e4f9d224d67 100644 (file)
--- 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 1c3858002889846e35d6ef153843fa63385a2a67..2f527a63a0ff190117b0bc4bda972ce7053d0aea 100644 (file)
--- 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 bae98c1b22a17a5806a8e8e102d81f818bbe273b..78c2ece9b134c2c0d3190d9fb50221341354c8b4 100644 (file)
--- 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 27ff4815816f1e27eabc0c571a134d83ac798378..3328d4c21d14f755cf2a62625e60d9ea0d3463d2 100644 (file)
--- 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 9109e34a4df167ef1110915926b8de31c188286b..c673ff87eae46fe494d590e1296833f632270d61 100644 (file)
--- 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 7455d93a244310670144e15e62785c5dfbf617a5..25e1a3adfd2555ee82d7f937911b0d1ba13d526b 100644 (file)
--- 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 9d22eb5f55d9a9a72826dc5576949a61f1a28d8a..241ec4554a2bae5b394f4aec859671dacc821f81 100644 (file)
--- 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 abc20191ec3448e1bb0886ddedca764532efc832..25a03e8dbecb1de9e7d3844486527bab50907bb7 100644 (file)
--- 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 bf635321b1e12ffd9a6f413d622cd14afc15c869..0177e7d0fdd0bab8d49f191ce0b3035cb52d1ef0 100644 (file)
--- 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 d5578b2545bd7ae0c7c5c0607e2f3be6b452fcea..98c560460ba5c8d6f35a2244ce6fd6fdfb581b9e 100644 (file)
--- 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 9974100fc8e51b1bab5cd481748a9d3773c3306a..64248d04367259403c7d124f45bad257928b21df 100644 (file)
--- 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 e690e28c846423dd8f81d38698240a20286a9b2a..f4ccc061b20a33e6cd3badd37d1b0d79badedcd6 100644 (file)
--- 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 7ac24cd1c68a97743e0822b183df5eb6ea40e06f..b7528c1e9332d820431c22d87f289aaeabe0d9d1 100644 (file)
--- 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 f804a10fc179d5c2dcd025af70204f33f65cf364..9c7ee3acae2c70a1462e0e6b6fe4c61503dbf5c4 100644 (file)
--- 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 68962f9ea95ae2d751cb639ab07cb67dd8b5cca3..3059b71c8809909acdb01a764f160693c6031ab1 100644 (file)
--- 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 c4a7fe5b4b30e7949307ee2da30ae9a9c1d7cc8b..6188e35db5e720ac27fa078f2965fbc186587d9b 100644 (file)
--- 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 ed3b8f1ea7cc7a97f81fb2c2f507640fead6d212..92d3a94b52cc1fe4540d8c0b1d8e038b3df40a61 100644 (file)
--- 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 0120bec2d50e3dadaeac530b97614f69179b3317..045baf77b008254c2bb679572c2cfe7316de1917 100644 (file)
--- 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 3c036a85371ba92157a617dd7186241498eb163e..18ec7dbc8fe3229ca7f31d2cb01257a7737d8a19 100644 (file)
--- 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 (file)
index 0000000..693e096
--- /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 9041340e0a02b981194374b49bb5b106f50cd45c..9c395414e5b418081cb635e1f218431d0c7576d5 100644 (file)
--- 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 dcc063478b40a7b507a1b0e6bb494bdbb76810ec..1b18f0010c2ab2917347fb12f39b2eacd2b44afe 100644 (file)
--- 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 1db37039ac456b4665ceb142edfa77da16f347b4..2f7431d59fc0407f5064dfc6bd74968d4afa566f 100644 (file)
--- 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 1a4fcf79d5aaff195bcb050298034db4ef18c19e..f91440b815219a14582b8b37946475d7b8e26c92 100644 (file)
--- 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 ea09f9b430aa37112fec7869e4bc4e0315ac1adb..81d62521f9600a9c1e1c225fda6f954d24079ab4 100644 (file)
--- 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 e2fd772ce4c7f68c67d737c4082c68b98fbb2078..4cea6652cbcea7923c18e96221fbac1229a114d5 100644 (file)
--- 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 95d1775413a66ad4223b2c872df6627cd032b0ba..9cb6c101cab86e65edf99fba24ce510772541514 100644 (file)
--- 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 1cbf5167423e8c2dad21b06f32f6e41d543a05a3..4cd4a5bfd55c4e36b354aa0d4c69a557f7f2def8 100644 (file)
--- 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 624a8c8f62fb8a9bac41ee38c2fe3d2fd816107c..76a8d750a23ed2a0bc5c50d1e7cc242d0c8e0181 100644 (file)
--- 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 89ddb8202b1de032c52c49bfa708562987b3d52c..e4fb74490310d48afba56d4fd20737958562e11d 100644 (file)
--- 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 28f717ef843cae1068cb7a8348244ca4ff920a05..3662685568fb05f2f0a64b6c521e3821b7404a89 100644 (file)
--- 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 3a666bdc3c018e4c0d498f1c691839e75803e59e..eded3b6bfd08bb4d5b2565763844bd867ced9ac2 100644 (file)
--- 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 080d161f956e93aea68581738e49fc25b1915ce2..ee50db3eee481cb50e869994f0eca398c91bb102 100644 (file)
--- 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 ee57079af71b4ef1c7d08f6a784510d5216241d9..b18dd0625f99e0e3e7da4a3d512b286544532e73 100644 (file)
--- 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 aaaad52bf3549288526695e2981c30ea69d49f8d..d11f7356dd938888c89e7ddabd6333fb52d7bfe5 100644 (file)
--- 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 44ee6c565e689da489b9a78d5c7f4c3ca9bbfe4c..25878e5f9c061cdef9bc00a75bd2599f8d84fc2c 100644 (file)
--- 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 57145bec77490b8db5c45f01afe071fa707c7f16..22ea337d032aa3aeccffb655d475b33b56df4447 100644 (file)
--- 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 b9ad26bc490e122f880f15a943ec56a81934c8ab..602383251eadfbe481dc35c42336eb7d515ec0e3 100644 (file)
--- 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 df1ad77064a59231e2dd78ee35dc621918e97031..bf48db25710fbcc2462d6029ba66ab807bcd8b50 100644 (file)
--- 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 938619381d2fed025352c10fbf3c86b874f1dc6d..92a5a319e684757c3801c42e50b75a858931b911 100644 (file)
--- 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 20ab92e58f3289848b26d33be176c4061bf7d439..e12f69d22e795751427e2771ba5518ae783de383 100644 (file)
--- 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 2fa7ffe2ad4f4564669fe926b25b06d8179b68f2..c92ad4d6f9be95582c63025660ea36d2561700c1 100644 (file)
--- 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 89eaabe68b8e7e6f6d94900d17c877639909e101..3d4886e3ec62433fa360a10c3c0eb41d08d3f8be 100644 (file)
--- 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 1fb06f6239db43a6391f0489de9c4e8ce23e7327..227abbf36b2a14094d57cc75944e0dba5a2b255c 100644 (file)
--- 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 080c4175a572c774ec6f16adcd187f31066d0a2f..13269a46695d0c4b05cbb6ac1c51e3cfcea72d92 100644 (file)
--- 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 b4b60443efa9f22a4d486cc888c395c672e7aeca..975de4fb3d05e915a64f3c20c2c2ce37eb537d26 100644 (file)
--- 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 280c37f500c43dfb11e726b86a5af0af68d76f26..aa0eab2d4cd07e2ba02e9255442ab5738eee1859 100644 (file)
--- 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 ebd35e746f13b320799a03ab7d2559d26d0bfbb4..532b230715ec3d0e922d7f77e2ddb55457fc5e4b 100644 (file)
--- 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 b1dc179ea0d0a14bd3e8f7c3342309f7ba005e7c..77234e8f0636e53d70217f9bd14ffa4815e95d75 100644 (file)
--- 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 f8e47ea785792adecf719b1d3c188137d9ed24d1..2673efa936f0d833121f070c9d2b0e6fe33eaeeb 100644 (file)
--- 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: