Feat: Branch cut stable/potassium

Branch cut stable/potassium and promote master to calcium.

Change-Id: I349730f80c0c1fe1c04aaf55190a456599d564b9
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 5a8c790bff7a23b61c4e38945a9d6b6dfb98fa81..db028846f83865d69b48d30b103f5bc06c386b0f 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -14,8 +14,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index a92413ad8b37b1cdba37277c869680f6079ceb38..5a0acff281fa188523f8691fae4f16d8131e9033 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 0eaee24c6dc5129334bc504cdf144f4a6c281311..ff1de8f89eae656aae4fa3d6b9dc47017ddb3926 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -9,8 +9,10 @@
       - gerrit-tox-verify
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:
@@ -33,9 +35,12 @@
       - "autorelease-generate-release-notes-{stream}"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
           integration-test: potassium
+      - potassium:
+          branch: "stable/potassium"
+          integration-test: potassium
       - argon:
           branch: "stable/argon"
           integration-test: argon

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index a0cd09810a113a6138056a00479dcd7a9a299f29..2e0a2014cd0d79863ba777fab2f186505789f399 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 73466bfd7de3e82cf302623d65a67945bb853354..34f3c9fc8d9ab80e9b07ed4b8c89ce28e358f858 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index ee3db96576d24a467f368343022ba71700e072a2..1f823b31340b4cca98d3ad7e57604b4fc1dee371 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 7c31a5cab8fcdfe7d40174c26db9e5d347c90897..bb0ca6b9ca504e7d22a4007c7927d93339fd6ee6 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 6f8b8f8084910843048c92774b682fb827177d0c..79be73946c6e18c1abda889967fa2a2dafe3baf1 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 8e9ec2c67037d9674334eb255b5cd3bf0a8e41b9..68e207e66603d8c04e7e89c4e6b77ce2fabba430 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 9583680b9b37fb0e518c2764b0b7ce4f9b29d735..9dfe49898ad67460f1f8ec04c6ea7c6a4ba319a8 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 3a00e037ab5371486b99fc54a63118f2e590b26d..816633a23195d3a4ea680fc25d0e8d7365f95f7f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 17dae0046f32c970237e94425135935e2e671e71..24a435ff2417bb8f50bee0e8c38960224c25059e 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -12,8 +12,10 @@
     functionality: "akka1"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index f8fefea22f60685346ecf3c063d7b224df61641a..eb94941dcce9c9bc0355e8c70f5304e20e720bf7 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -13,8 +13,10 @@
     elasticsearch-attribute: "disabled"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index c086977b1cf39004a77b72480fe5371bc3fc0b2d..c1ab33009aa93220c48371b17cc69ab54145556d 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 82ad119ab6da86fdff7ff25d1bbdc24803b4fab3..0f282cc2f64a7d519c8ddc90f0929ddb0b4daa75 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 25b73802f5011e0c7d18a968443576aedbef695f..367ccba9417413545060a1fa393bd0e6997aa824 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 18586867bdea7c911058d184e1150d52a4671d98..35258303a0e33ae4fabf69b4f9b694c4ad2bec1e 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 8b7c4ee4e261530c2e29c1a7b2777fd1891d2d29..019ea48f2c9a20922767b7168430473d4f1dd1f6 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 2ca9dc07d3d1a4238f545c84d46b28d21c75133c..46e8de14e30f438ee4e2f2da694f46fbcd902768 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index bfe7e13d3e59303d0b1c34124026cb9c2393973d..27372f5b8baaea4f68ed0358747567d873d20bbe 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 681c68adb52cd752b946f2dfd6ea86ff17cbe7cc..7c01571e3a2cba2f14848ccf3e36014447f34d5d 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index d5d7ab909892820e7ebbc81b0d61cca1f7a66dc8..65f231dcd662d622efe1af58136a8f34fca8f3ae 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 55c15562f8424b9c3ee5a07db4f3c9993a59d8d2..e6a0f52e5a55571b7d93eabb20f8b911fa2a4b59 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index cbd428d9f132557fc9a5ea71a3b42ed3595da8ba..4e4d70b36db034f03ff9f9ef5e8b190ed1c6a70b 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index cae53fc9520d48b1e291a293501cb5504ac8c506..9618b7f52e4f1713f40d74ae021f06c194a6238d 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index a6c6550f1f5590519fb91e203851c85c47e50269..324fad9af8aabae64d92947d0e35d22b6db67e3b 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: daexim-calcium
+    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: calcium
+    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-potassium
     jobs:
@@ -14,7 +37,7 @@
     project: "daexim"
     project-name: "daexim"
     stream: potassium
-    branch: "master"
+    branch: "stable/potassium"
     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 94bc5d462781def6288da4010c0dc31e92150760..8cfbdda6531904dff65a9745bc785a53070986bd 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -302,3 +302,32 @@
     csit-sanity-list-potassium: >
       openflowplugin-csit-1node-sanity-only-potassium,
       distribution-sanity-potassium
+    csit-mri-list-calcium: >
+      aaa-csit-1node-authn-all-calcium,
+      controller-csit-1node-akka1-all-calcium,
+      controller-csit-1node-benchmark-all-calcium,
+      controller-csit-1node-rest-cars-perf-all-calcium,
+      controller-csit-3node-benchmark-all-calcium,
+      controller-csit-3node-clustering-ask-all-calcium,
+      controller-csit-3node-clustering-tell-all-calcium,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-calcium,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-calcium,
+      mdsal-csit-3node-netty-replicate-only-calcium,
+      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-master
+    csit-weekly-list-calcium: >
+      controller-csit-1node-notifications-longevity-only-calcium,
+      controller-csit-3node-drb-partnheal-longevity-only-calcium,
+      controller-csit-3node-drb-precedence-longevity-only-calcium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-calcium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-calcium,
+      distribution-deploy-calcium, distribution-offline-calcium,
+      openflowplugin-csit-1node-longevity-only-calcium
+    csit-sanity-list-calcium: >
+      openflowplugin-csit-1node-sanity-only-calcium,
+      distribution-sanity-calcium

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index f70d955b4632817eef392c6f43deee8217dd30bc..39f85460ec13b07e4c69bf34d25a50260370104e 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/integration/csit-jobs-calcium.lst b/jjb/integration/csit-jobs-calcium.lst
new file mode 100644 (file)
index 0000000..2465ce0
--- /dev/null
+++ b/jjb/integration/csit-jobs-calcium.lst
@@ -0,0 +1,20 @@
+bgpcep-csit-1node-bgp-ingest-all-calcium,
+bgpcep-csit-1node-bgp-ingest-mixed-all-calcium,
+bgpcep-csit-1node-throughpcep-all-calcium,
+bgpcep-csit-1node-userfeatures-all-calcium,
+daexim-csit-1node-basic-only-calcium,
+daexim-csit-3node-clustering-basic-only-calcium,
+distribution-csit-managed-calcium,
+jsonrpc-csit-1node-basic-only-calcium,
+openflowplugin-csit-1node-cbench-only-calcium,
+openflowplugin-csit-1node-flow-services-all-calcium,
+openflowplugin-csit-1node-perf-bulkomatic-only-calcium,
+openflowplugin-csit-1node-perf-stats-collection-only-calcium,
+openflowplugin-csit-1node-scale-link-only-calcium,
+openflowplugin-csit-1node-scale-only-calcium,
+openflowplugin-csit-1node-scale-switch-only-calcium,
+openflowplugin-csit-3node-clustering-bulkomatic-only-calcium,
+openflowplugin-csit-3node-clustering-only-calcium,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-calcium,
+ovsdb-csit-1node-upstream-southbound-all-calcium,
+ovsdb-csit-3node-upstream-clustering-only-calcium,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index c33a25ec0bb20937eaa4c8f24d381c7e39ab219c..f13c31b22f9c04ff1970b83de3dade55365d5088 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,8 +24,10 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:
@@ -55,7 +57,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
           dependencies: >
             daexim-maven-merge-{stream},
@@ -64,6 +66,15 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
+      - potassium:
+          branch: "stable/potassium"
+          dependencies: >
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
       - argon:
           branch: "stable/argon"
           dependencies: >
@@ -113,8 +124,10 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index aaae01162e481b3a98491cbc816d7b9dfb312743..17ab952fd9bfb8f6b9450d9fe276ecbfcabd1931 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:
-      - potassium:
+      - calcium:
           branch: "master"
+          csit-list: !include: csit-jobs-calcium.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
+      - potassium:
+          branch: "stable/potassium"
           csit-list: !include: csit-jobs-potassium.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
@@ -55,8 +62,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - potassium:
+      - calcium:
           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-calcium.lst
+          csit-mri-list: "{csit-mri-list-calcium}"
+          csit-weekly-list: "{csit-weekly-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
           csit-blocklist: >
             aaa controller genius lispflowmapping l2switch mdsal
             netconf netvirt odlmicro sxp yangtools
@@ -103,9 +123,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-calcium}"
+      - potassium:
+          branch: "stable/potassium"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-potassium}"
       - argon:
           branch: "stable/argon"

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index d294e25f3612a2779133d42d6c1bc1cb7e99b0de..46378d98051053f4e389522d340c712f87cd53e2 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 6fd0dfd8cb23c53b883e779b1cdb755d6459bce9..e28710c8a1fc2802515029aedffd752b0f53d3a4 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: jsonrpc-calcium
+    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: calcium
+    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-potassium
     jobs:
@@ -14,7 +37,7 @@
     project: "jsonrpc"
     project-name: "jsonrpc"
     stream: potassium
-    branch: "master"
+    branch: "stable/potassium"
     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 5065c037935d4e8f85f508a587972390e620fb3a..a6099f3a369ee8ff10bbf50bb16b0762032c0da1 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index c664d05406b0880235c1d3225d6af162561e6391..7f273eaeecf9299e4066760604361e49b2cff846 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: lispflowmapping-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: 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: calcium
+    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-potassium
     jobs:
@@ -17,7 +50,7 @@
     stream: potassium
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "master"
+    branch: "stable/potassium"
     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 fbf51b9fb88890439ef0568d29baf9aab6f835cd..46a628bc7db2f53ae1112e27bce1e039dcda0888 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -13,8 +13,10 @@
     functionality: "bindingv1"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index 1e99c650f66601c2de70dc67500e5a751f0f4bdd..039d218fc831f808c0ee5805c4e412d5737db055 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:
-      - potassium:
+      - calcium:
           branch: "master"
           install-features: >
             features-controller,
             odl-mdsal-replicate-netty,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
+      - potassium:
+          branch: "stable/potassium"
+          install-features: >
+            features-controller,
+            odl-mdsal-replicate-netty,
+            odl-netconf-clustered-topology,
+            odl-clustering-test-app
       - argon:
           branch: "stable/argon"
           install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index c35a7a24d10327a1cd209f736ba9635bac4e9ac3..437c4e30cb243d11731429058649a02d876cc4f1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 4eb3ad0776ecc5c01f1b4d7bb636c09327232a1e..04f18dcb9ce68e421ca89147669b0225d11c89f3 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 6823bcc7da06fe6691f3b8a138310e0a8de58b25..7bb731df96e811063e883bb59a71cbe05b82f2fe 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 508e5d9ece8682c49fa4a2a05057e25d686a660f..1303797aafa3407d1c521ee7c6264eac570ecd49 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 6aa3d9b21b14bea449cfa1525d1208fc17a13ae2..f119967f7d09ac53f1c65a374ecbfa480ef46e30 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 9853c3abb3c4a40d2fbca08997b823da931ad206..10c75eeb9ce58a14b385be001fca1f341fe5c61f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -17,8 +17,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index dbea4d29c5ae872f05519092fd8d4d2243e1c3d0..c45cdd366837ff82f7e8d58de2f78dad3ceb3f24 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 9df62629e7827d148b737d42129d3d514303b3d8..7ad41637fd14830f48a872d2de808491fda21d49 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 953fe6cb24830a525bca3cd4b6cc1275dd8db25c..aadbe1d326b3df6205f89b1ee32de6e1ed486394 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -14,8 +14,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 7b5f4843bd8f25f22d6f259635b38164bf99bc2f..0ba66a8fa42e56698bcd633c6204ee9d9bad53ae 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 4b9c68d780b5b4bd80e5861dd7870f78abe5ec40..6aafbcad83f7c94c57509e59be4136d229b38622 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 9c9e05d8808f5cf281d9b2dc91430f7b8c32ee2a..7bc3bc637d3d8fba9a3f6f9a9d4daf30eaa1f669 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index cf5ba163bfb88c9cbe856816ff3aaaa839f7115b..ba482e78896e09201bd405d8a58b5f4df933070b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -10,8 +10,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 8013eb3f497b25977e22f0dacc577e0b4b383394..3a1b55698e937e87f7df4e09cb9176f9758a0ff2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: openflowplugin-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
+          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: calcium
+    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-potassium
     jobs:
@@ -18,7 +50,7 @@
     stream: potassium
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "master"
+    branch: "stable/potassium"
     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 466abaf4fca98c039371fe0ab1ad2e9b8e8c9188..e6f7ada800d4db65336e08ce746bd2535564ef4d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index dd4459913dc8a328d92929b2f043dec9a6f803a9..521faeefb7675380b023df8c03341ff5541d3dce 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 6dde13a38169fad2576fb7defbb56a84cd0ba194..501761790accebe4d446b79ed5eca3218d2c638c 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:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 222cc0230ea193b800176b21178ab5e9debdd6f6..a791e7bc0692f74bf2eb25c4ded68fb2c7bde89a 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -9,8 +9,10 @@
     mvn-version: "mvn38"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 9342fd3e4d7fec3bd726e48dad7373c535077e12..d5d03e28c09bc9e73738beda98677a458effb96f 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: ovsdb-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: 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: calcium
+    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-potassium
     jobs:
@@ -17,7 +43,7 @@
     stream: potassium
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "master"
+    branch: "stable/potassium"
     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 5b6daa938303bfa18d808232c288f6cfbcc4f22e..128b5bf5f5d867d7e4a970841c9515b9aa9efed2 100644 (file)
--- a/jjb/packaging/helm.yaml
+++ b/jjb/packaging/helm.yaml
@@ -304,8 +304,10 @@
       helm3.7 package .
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 9ff2c3d56b02bea7fcc3b307564bb3d2711048a1..3c0add4126f889448981d37fccb1a99c2bb7844a 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -8,8 +8,10 @@
     mvn-version: "mvn38"
 
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 901173463ad681f688e48e8abac6de7d2a057be9..630c36200024a109bbae659164f036457fded53d 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-potassium
+    name: serviceutils-calcium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
@@ -15,6 +15,38 @@
       - odl-maven-verify-jobs-jdk17
 
     branch: "master"
+    stream: calcium
+
+    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-potassium
+    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/potassium"
     stream: potassium
 
     project: "serviceutils"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 3f81f9797030288c6172b1bf26907d79a08cbc7a..9e136edeee50bc73b9635ed592e7e7a5719aafc4 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -13,8 +13,10 @@
 
     # Project branches.
     stream:
-      - potassium:
+      - calcium:
           branch: "master"
+      - potassium:
+          branch: "stable/potassium"
       - argon:
           branch: "stable/argon"
       - chlorine: