Feat: Branch cut for stable/sulfur stream

Move master to the next release (chlorine).

Issue-ID: LF-JIRA RELENG-4123
Change-Id: I879c4d53d67f13dc510a8abf72464b998bf8a147
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 47ea576f44095f625536871017655aabd76fbf2a..a50867cd2cc078fc87ad4995ed22f4c7ef2af10d 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 8917abc17b81bdb03a3eccdd30850bc4ceff3eb5..71ecff87f473078d35cce31296a5124b407f4ea6 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "aaa"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index fef79a6f7f6662b23cd72a75d1294db4bbed8351..5d8544ff08ce79affbec042aa06fe312fd4a3c7a 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: archetypes-chlorine
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: chlorine
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "archetypes-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
 - project:
     name: archetypes-sulfur
     jobs:
@@ -8,7 +26,7 @@
     stream: sulfur
     project: "archetypes"
     project-name: "archetypes"
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "archetypes-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
index 4fd72cdd0f162834a315d929671a6a802340839f..9b5e639867ccb2dded2c0eb93c77a68cbf021b72 100644 (file)
--- a/jjb/autorelease/autorelease-branch-lock.yaml
+++ b/jjb/autorelease/autorelease-branch-lock.yaml
@@ -80,8 +80,10 @@
     jobs:
       - "{project-name}-gerrit-branch-lock-{stream}"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 2099daf2b602e954fcab251e329f979b8a924096..27cb24d304ede69167469ae8eb1c993a1c2beea6 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -13,9 +13,12 @@
       - gerrit-tox-verify
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           integration-test: sulfur
+      - sulfur:
+          branch: "stable/sulfur"
+          integration-test: sulfur
       - phosphorus:
           branch: "stable/phosphorus"
           integration-test: phosphorus

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index bd9d0ae786de5658e01ed85dad9680650c7550f7..ca12adcdc6bd9bd0d50ef0aa78e73554f0c6d274 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:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index c67c52a0c5f7cf17269d127a019bdafba6a59db2..46df826963e3387f73faacf83b3a20cdc4f4ce2e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index c0ab7ca61f7adbd80738bfa3d5b35ef02b374af6..41535e56ccc69e906cb77a7ca9b7d27cfeb00d66 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 71ae496b56a7aa5f3a5c1ea03ea784a9c41b01b9..6d3fed52c9fe0a5cc9ce994bb93efe99b5592d29 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 38b3ec34374ad0700b4be09c6f2013af133626af..04e1733521ceb233d0c36646eae0361f99fdb5bd 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index cb7ded29739054568f276441e2fb8ef7c1132738..452b2081588214302caa49eccf6d58c3a4fc9017 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 0ce3aa4605760296f3ac2e801c37d014a572f597..c1b793d7939d682c627667ae8e310e4d4914f5db 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index a78ed84f970889a142da910efadad7101c336cb7..af305f57a25acc883740305714248b811a790a73 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 19be5fea0936fa75c0f649779ffc4f713d1b0cb8..d7a2658ddf304e6c1169a237c377b7ab05bc8340 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 92965a89a7c6e8fd9188ce983fdad85bbfcbff66..839f983c09563bf7e8cf45153e9e0b8f83bd92ba 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,9 +11,12 @@
     functionality: "akka1"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index e3e9e9a27a1a2ac39b3bedccd64aa66a73d85531..8c5aad9df3c8d0157d02eeb7e029b21f0625cef4 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,9 +12,12 @@
     elasticsearch-attribute: "disabled"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 784254de6ae9f70e603fc8d871b5ac108aa4e866..7b1a5799feb04b74d2e34541ba226df6ad0a0f15 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 49f9c205f2de03cfe3d11a5800de9d596b22bbb9..3ea5e77adfdabc3200e936646cfa669b4a0be73e 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 8dfe6fececc358fa190b2446ad2b1e8f289c3b01..da45b1c4cf8393aab506872347443c9010a671f3 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 6265325aecc2d130c23ae35200381ba58acc1b2b..bf279e55b0c83d0c70ade996832a36c467329910 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 8bf68eb9513231391d5d19c659dd1c2a37c6157f..91cbfcea39ca3b1de34234e006186d910aa41510 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 19484156336eb90239a2cea47c4a8271ca260ac0..3ff6efb0ab0d6ce6adfa9bdad892326102aff6d0 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index daaef5d251214987aa1bd3ad62ba3aa9c58f2d41..fef29c4cf1e87704dd2571d888e38a83cbf017ac 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 0b4444bd0db3fe970277216da85415b10883012b..7ed846e6886edda02dacb68661f42d5b0db00e3f 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index c2858adcd3f316abcdbe5eb836975e057682e7f8..126207535da9cb07feebea4eaca9c328a0e9e6a9 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 5b52733069db4d6d38b66675a39d4b690c3383e9..c08b0e2ad5b801895c2b6de06162134fa74ec162 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index 3e3b100bedc9071c52677404a6aaf1543a030761..9a7b7e9c998935975929bfdbb6e93c42ce08905d 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "controller"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index d164ad50f4e5c8a504a34bc8f4ce1c3224d761cc..3e4a6de67701b6bf5ee1ba3438fe7e27a0821e3f 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 63f8dc1bffa6cce255aa614a7c692b7ebe4d21ec..43809ca61d3d2a780d8a0dbfb5b6074c9469c6ce 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 6b951e49f702890276dcfa31aeb03b7245b78394..852efcddd7307734539ff183b4235b1af5b8854b 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: daexim-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    project: "daexim"
+    project-name: "daexim"
+    stream: chlorine
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    build-node: centos8-builder-4c-4g
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-sulfur
     jobs:
@@ -15,7 +42,7 @@
     project: "daexim"
     project-name: "daexim"
     stream: sulfur
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     build-node: centos8-builder-4c-4g

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index f4e51b17a1a9c17c816d1fc4defdd33d6d9b0d5b..8fcde1b05aac3f3fd6f02d862eebad7dcea98adc 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -296,3 +296,20 @@
       distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur
     csit-sanity-list-sulfur: >
       openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur
+    csit-mri-list-chlorine: >
+      aaa-csit-1node-authn-all-chlorine, controller-csit-1node-akka1-all-chlorine,
+      controller-csit-1node-benchmark-all-chlorine, controller-csit-1node-rest-cars-perf-all-chlorine,
+      controller-csit-3node-benchmark-all-chlorine, controller-csit-3node-clustering-ask-all-chlorine,
+      controller-csit-3node-clustering-tell-all-chlorine, controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, mdsal-csit-3node-netty-replicate-only-chlorine,
+      netconf-csit-1node-callhome-only-master, netconf-csit-1node-scale-max-devices-only-master,
+      netconf-csit-1node-scale-only-master, netconf-csit-1node-userfeatures-all-master,
+      netconf-csit-1node-userfeatures-rfc8040-all-master, netconf-csit-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master, yangtools-csit-1node-system-only-chlorine
+    csit-weekly-list-chlorine: >
+      controller-csit-1node-notifications-longevity-only-chlorine, controller-csit-3node-drb-partnheal-longevity-only-chlorine,
+      controller-csit-3node-drb-precedence-longevity-only-chlorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine,
+      bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, distribution-deploy-chlorine,
+      distribution-offline-chlorine, openflowplugin-csit-1node-longevity-only-chlorine
+    csit-sanity-list-chlorine: >
+      openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 4f736eebbac293b66ae0ae764f6ba5872a3c2976..40c3dad8af7c36f1c061018a90ed888ffc60d592 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 56c4ad9ac524967a1d4bd6abb0361eb2efd87452..440844c240501f778cdd5b89efdbf5d3e8497da5 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 17eb89ccbb7d79507cb213241a196987c14c394b..b8996c1024952a22a22089a5a00052d25d9c5a30 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -19,10 +19,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           mvn-version: "mvn35"
           java-version: "openjdk11"
+          csit-list: !include: csit-jobs-chlorine.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
+            bgpcep integration/distribution
+
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"
           csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
@@ -61,8 +71,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          csit-blocklist: >
+            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-chlorine.lst
+          csit-mri-list: "{csit-mri-list-chlorine}"
+          csit-weekly-list: "{csit-weekly-list-chlorine}"
+      - sulfur:
+          branch: "stable/sulfur"
           csit-blocklist: >
             aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -109,9 +132,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-chlorine}"
+      - sulfur:
+          branch: "stable/sulfur"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-sulfur}"
       - phosphorus:
           branch: "stable/phosphorus"
@@ -164,7 +191,7 @@
             - file-id: odl-elastic-cloud
               target: "$HOME/.netrc"
       - integration-install-robotframework
-      # yamllint disable-line rule:line-length
+        # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243
 
     publishers:

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 697fccb9346db175174e704874f98fc2daeca440..255f50984a93bb764942f27de6a008773e20db8d 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 9a815b508ad48ece8e3f8968d3c74b7d2243f0b2..1f5bb68d6c8899493ab08ee66a8d91edddce48b9 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: jsonrpc-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: jsonrpc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
+          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: chlorine
+    java-version: "openjdk11"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    build-node: centos8-builder-4c-4g
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-sulfur
     jobs:
@@ -16,7 +43,7 @@
     project-name: "jsonrpc"
     stream: sulfur
     java-version: "openjdk11"
-    branch: "master"
+    branch: "stable/sulfur"
     mvn-settings: "jsonrpc-settings"
     build-node: centos8-builder-4c-4g
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 916f0494d6c7e40520d2db781de98f429a1042cb..9278dc4552a6f40f093c160f8685582b433c852a 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 4d7482a3c203bedef14d3120f33575974e8b3488..fc4d46fc7b7462788588eae415d3ca0d675ec76a 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 6ed3621c7af55e6bbdee24b0821065db2ae96903..3bc53753fa154977f86a438a296fc4cf2f028fac 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 4d8313801c30681ebcc1d26be9a8320c7518592c..160824f79a96a06cdb95c7dbf46ea75ead6b0158 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -10,9 +10,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 7b40eea2fd659209049e239b97f000e279eeb73d..e8a948b6b5af4d27323d5cd83514f78542864564 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index c77eefe6835a08da856d0d2e1be4a16241329d40..eeb872db46e971ff7503914a05289e315b58784d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,38 @@
 ---
+- project:
+    name: lispflowmapping-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: lispflowmapping
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
+          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    stream: chlorine
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"
+    archive-artifacts: >
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+
+    build-node: centos8-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-sulfur
     jobs:
@@ -17,7 +51,7 @@
     stream: sulfur
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index d0a5a4dbddaeb91ae27e3c7674a21bbc9e2191ab..7022d10a64e090e7024a8f94777376ee8a497d57 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
     functionality: "bindingv1"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index 4574617725fdab30a983ff5c8e1bd5309ece3c08..1d010e2562e003523d2dac8e6426f61fc2e43f45 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
           install-features: >
@@ -21,6 +21,15 @@
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+          install-features: >
+            features-controller,
+            odl-mdsal-replicate-netty,
+            odl-restconf-nb-bierman02,
+            odl-netconf-clustered-topology,
+            odl-clustering-test-app
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index 57df5370a9168122878eb81de7cb14a518b118bc..007a6cd01f611006b621e01794e5fdbad1d6b057 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "neutron"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index 505a3947d3f2300d85a5ce0f90f3788ef73c3d4f..a00459017f87900efd0365e56cf3af8bf8a93f79 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -13,7 +13,7 @@
 
     # Project branches.
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf"
@@ -21,6 +21,14 @@
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
             -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+          functionality: "netconf"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
@@ -59,7 +67,7 @@
 
       # Project branches.
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-devices-scale"
@@ -71,6 +79,18 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+          functionality: "netconf-devices-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:400
+            -v SCALE_TESTS:TRUE
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
@@ -125,7 +145,7 @@
 
       # Project branches.
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-general-scale"
@@ -137,6 +157,18 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+          functionality: "netconf-general-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:400
+            -v SCALE_TESTS:TRUE
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index ec132bdced2bec4702e031c2c6cac04ec51a4d7c..41652984722cce1e378042fbf3654a1468d1e5f7 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: odlmicro-chlorine
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: chlorine
+    project: odlmicro
+    project-name: "odlmicro"
+    branch: "master"
+    java-version: "openjdk11"
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    mvn-settings: "odlmicro-settings"
+    mvn-opts: "-Xmx2048m"
+
+    # Used by the release job
+    staging-profile-id: 44ce67428fd0d
+
 - project:
     name: odlmicro-sulfur
     jobs:
@@ -8,7 +27,7 @@
     stream: sulfur
     project: odlmicro
     project-name: "odlmicro"
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     build-node: centos7-builder-2c-2g
     build-timeout: 60

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index d8614e6549bf9993b9e41aa99a6ce7bb94a78e5f..e4bbab9983ec1c6daa7cc5478ad0e77c0bcdd4a0 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: odlsaf-chlorine
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: chlorine
+    project: "odlsaf"
+    project-name: "odlsaf"
+    build-node: centos7-builder-4c-4g
+    build-timeout: 120
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "odlsaf-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"
+
+    # Used by the release job
+    staging-profile-id: 2802f0e38ee665
+
 - project:
     name: odlsaf-sulfur
     jobs:
@@ -10,7 +30,7 @@
     project-name: "odlsaf"
     build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "odlsaf-settings"
     mvn-opts: "-Xmx2048m"

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index 83c6fa45f39e0ec6879245840789949762c464da..be4537a0f4c764b21be37013b399ee16355a4feb 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,9 +10,12 @@
     testplan: "{project}-basic.txt"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index ace2a005a26e90a7885f6ab2ba0d741f9ff26dea..18a1d929ea576af3aa6405b4e70f0df326d07a29 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 04a1a9acda7d9120ef95f02b08d1de2b5ccf6227..4e4c3f9620559800cae31c0341559bdeac92333c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 3ae70ec4c6850b094fb24867414f8302d337dda0..dda4a02384bf9bd7a9174d8a0c569bc75e9c876b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 72ea2dec353ebedd15d5925a4979eb38e97a2c7e..007d66ab86869fa0e7040533c82c45c04abacaf1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 2c96b68e1ed064eb09eacf8687194ba4b69cddf7..55d1a853cf3895e474e79c5524b6b64bdbec97b2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index b1b92d5b5537ffda4640684bf6702946612c06d1..e1d5b0bdf78a90d632d95a36714723e3eec34c21 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,10 +14,14 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
           install: "all"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+          install: "all"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3691ceb66b109da27640ec00c1f99deb26d55ce8..f558837c6a5a8f59e4a5351e99f4e1b9960fb7b8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -16,9 +16,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 3c9536a32207535f4cd935f5113f4a12fd74319a..dfe8d352e48e73899ccf47df6423b9d5134bf7e0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 6876ce0f9e444e167cf69e3f0ee076aa30a2e1d0..6a26aef3236604c898645b960cde5227323ee296 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 6e2214cb088679a3f1628c3adde493b5f729108d..048da88552afa6905cdb666f87d01eabc0119066 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 3f482ea4297c5486d62642654708e03e16a2d91f..4eac308409d446a1369cd4c361a0f52ff71ea5a0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 02faaff4cc5c70dad6d8236ede213bda647d9c73..4ff61cf595e9c92932c6d252db7081cdadd78b01 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index beeb2a5fbf07272ac60de05996a518d96ee4366c..8f90fc716b557e1f4583142534890ed239e55c9c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 403ef0953ac63deb430c543c950b062bfb625d66..8aafddc1aad2e4e352059c8d03f541e7f7ae4db2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 56c15e01571905cad5a11bde7b90ee5f041eaa74..450053d5814722ced1b90a06caa2916d52620e07 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,38 @@
 ---
+- project:
+    name: openflowplugin-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    stream: chlorine
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos8-builder-4c-4g
+    build-timeout: 90
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    dependencies: >
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-sulfur
     jobs:
@@ -18,7 +52,7 @@
     stream: sulfur
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "master"
+    branch: "stable/sulfur"
     build-node: centos8-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 528aa400f4c6e21a57ccc3f376500d1fb303ab7c..80764c501a3bf60be5a27baeb88422f0c8d8ec37 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index ea353fb7e18f878292493a2150ca18d6ec068222..f0b2e71b657fc86eeb7d9b43d3a039305c50341e 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 1953d9222aed9f17a79a6376f3aeb9b72973079f..6c9c8213d4eaec3ba75e36fd8464e4f1cc2d5ce1 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,9 +5,12 @@
       - "ovsdb-daily-full-integration-{stream}"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index eef2ef960bd91b693e0129350c24cc797462ef01..c331a9107c09fe54f9284de4a17efbca9a87dc9f 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,9 +8,12 @@
     project: "ovsdb"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           java-version: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 13e6acfe2a1b7c20d27f267a35c9b1590a7c456e..58709ec7301c7829f7828ef33cb8a34950615999 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ovsdb-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: chlorine
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"
+    build-node: centos7-builder-4c-4g
+    java-version: "openjdk11"
+    mvn-settings: "ovsdb-settings"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-sulfur
     jobs:
@@ -16,7 +43,7 @@
     stream: sulfur
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "master"
+    branch: "stable/sulfur"
     build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 7bd3b90a502c57d9901671a034bc30ab53f05c02..3d984b3d81796402705aa9b438c60992813ed428 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: p4plugin-chlorine
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: chlorine
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "master"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[p4plugin]"
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-sulfur
     jobs:
@@ -9,7 +28,7 @@
     stream: sulfur
     project: "p4plugin"
     project-name: "p4plugin"
-    branch: "master"
+    branch: "stable/sulfur"
     mvn-settings: "p4plugin-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index a10f2e114a09f531d1018fe88360377a8ee5b4f3..1d241209d0c9f6e9eaa68111bc6a13b237a6fc5c 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "serviceutils"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
       - silicon:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 2c0c4cb3e1ea78cc8fdd0b461caf9996f768a2c6..aad9dfb5472dd7ad81eb41f62bdf6b37fe4d235c 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-sulfur
+    name: serviceutils-chlorine
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
@@ -15,6 +15,40 @@
       - odl-maven-verify-jobs-jdk17
 
     branch: "master"
+    stream: chlorine
+
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"
+    build-timeout: 90
+    dependencies: >
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-sulfur
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    branch: "stable/sulfur"
     stream: sulfur
 
     project: "serviceutils"

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 63e4fcecfbcd6674f6581abea648a257a497f236..5d3102063f765a9488ef6f93f30cd36bbdc4cec8 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index f7a11593b43f1b1cfe0a3101bf983384f5c835e0..eec62f779fef85301c7751cd67c4e498a8f1bbab 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: transportpce-chlorine
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: transportpce
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
+          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
+      - gerrit-tox-verify:
+          build-timeout: 360
+          build-node: centos7-builder-4c-16g
+          parallel: true
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: "transportpce"
+    project-name: "transportpce"
+    stream: chlorine
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
+
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-sulfur
     jobs:
@@ -17,7 +45,7 @@
     project: "transportpce"
     project-name: "transportpce"
     stream: sulfur
-    branch: "master"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index c47acfd1ddb1ec981bc4f687c9ebe6b8cff508ef..78549965e2f8bd64bdb4ba8aa4c350c0a100361c 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,9 +12,12 @@
 
     # Project branches.
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index ea488023f069545658e62191f43ab697a0db0992..c59532580250b048136581ccd8b5a0a26f70ff5d 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "yangtools"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
           jre: "openjdk11"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"