Feat: Add branch stable/phosphorus

Bump master branch to Sulfur and add new branch
stable/phosphorus.

Note: master stream renamed as 'Sulfur' instead of
'Sulpher'.

Issue-ID: LF-JIRA RELENG-3814
Change-Id: I7360f54d433b6523f1df67ad938df10d919f76b5
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 26e8409bf1823dbbf8adff90dd12524695a27481..51ff7cdec0e7fe9a9d127cdef951f81dfab37a9f 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index ccdc972b1fcd5ff937a1c2eb23cf2251de7191aa..96f5474912677d18f45dd15cf04f77bc0828945b 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "aaa"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 9d6fa5ed77e9354b10a10ddf44aad6178bde944e..185b64888ff051838897e825b0d42a2e3d667aa9 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: archetypes-sulfur
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: sulfur
+    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-phosphorus
     jobs:
@@ -8,7 +26,7 @@
     stream: phosphorus
     project: "archetypes"
     project-name: "archetypes"
-    branch: "master"
+    branch: "stable/phosphorus"
     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-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index ba922436475b3e34bc12f5f79b256376c97e729d..fee0354f49e4718e9f535256d00d6aeb7dca4702 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -13,9 +13,12 @@
       - gerrit-tox-verify
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           integration-test: phosphorus
+      - phosphorus:
+          branch: "stable/phosphorus"
+          integration-test: phosphorus
       - silicon:
           branch: "stable/silicon"
           integration-test: silicon

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 77ceb465934e9faf5ff2269c0ab223a337b2976c..1fbc9cb0f263577b7d612fe68d7203767447ced5 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 8ec2890c58109ab895b1eeeb440fafd3659ded54..4d8ca3e3cfc7692d6fd46f1cda1d81d416bb9dbd 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 0933d9a714f6e365c1c85721a3a90c4f340de76d..2e516db3d0f64cd4e25a4d8159aee9783cbfa104 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 157b39c7539a6183994c4cf811b086b71e3e8b61..7157b9fe67f1b9de5dee06d7271869e857f4d45d 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index b9f3a84ca6655f945d2e6848fc32d549725d1351..d79d3f5705a8ce5b852c8fe01cc70d63c2de83c0 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -11,13 +11,16 @@
     functionality: "bgpclustering-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

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

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

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

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 22da66b7347071a29928d66c69df74f36f5d48f9..7d5f7eba81c37cce182607241715e9180b729fca 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,9 +11,12 @@
     functionality: "akka1"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 1cb0cec64737a12c43ac073799695097f9321bc7..f35e89082728a4e7d5e46a7a31854e9f54a0a27a 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -11,13 +11,16 @@
     functionality: "cs-chasing-leader-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 697a4d539448f9977661900ba9a61f680e4a316e..a3d1ba7e9adc306ec2a610055f97e716ff5b047a 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -11,13 +11,16 @@
     functionality: "cs-partnheal-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           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 d844c6970ede9d5d2e5ca89ca9e19191bde8d586..0587e79e233ecc5636d8cdcfee615ecc4b5af248 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -11,13 +11,16 @@
     functionality: "ddb-expl-lead-movement-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 5f304f04258b7050516066f1bd0cfd936b7c9867..b75ffd58bc9ab1d01a39709eb08e5b66b212ad73 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -11,13 +11,16 @@
     functionality: "notifications-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index fb45b78326b6ac0a3978da37618923287cd11db5..3788500306b6935fa7b121db85ba12cf63d91eb6 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -11,13 +11,16 @@
     functionality: "drb-partnheal-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index e5ddddac8abd6f683e88f20866b81fd20e14f885..aa88ab063f1de53158527c4d183b1f865cd69275 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -11,13 +11,16 @@
     functionality: "drb-precedence-longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 7b80ca4e340effa10d87d1d94653a747481c534d..fb4ed988a39cccee7c17beea00d1d5b951e7bdfd 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 4a175a06470e99a1f0ca7921b4783b8dc7d802d1..9368e149d35590822e2bda2674d7e035b15d0424 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 3457c15449a14a4b1c6fa27d939ac9d6e9d43f14..fd463c516cde7e8374ade4fa1901130cc4c4a93b 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           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 aceec9f93ed3e20aefca2c0dcfdbaae6b85584f0..54d18d5403f4b628257acd5df00b4f830085151c 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index e7e367f392c525ef8eae289400ebb3e81282fa6b..46656a77e4a0e79e5082c912961965e225609fed 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "controller"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "3.0.x"
           java-version: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 8297973dbbfc142e12993487c0dacad59386781d..209f583fc1f9fc1b1e8f4d2ba411e64628b99f68 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index c6b84dd2af20ed7ae3d78d2ef44d6adf22dfeafe..08b64df75639d38f1c5d460d04f595e52f2a910a 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 1e22f4cfcb6700737bfe59f248e47bdab2ba651b..0a4e37c5bfcaf248ae61a5ef23a65639d5b82605 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: daexim-sulfur
+    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
+
+    project: "daexim"
+    project-name: "daexim"
+    stream: sulfur
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    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-phosphorus
     jobs:
@@ -14,7 +39,7 @@
     project: "daexim"
     project-name: "daexim"
     stream: phosphorus
-    branch: "master"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b227f087c1f69d166bced9a6ba83d91b5d1a172d..a01e2f8d7163a41de258c89699ed0910b5fd3d4d 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -298,3 +298,24 @@
     csit-sanity-list-phosphorus: >
       openflowplugin-csit-1node-sanity-only-phosphorus,
       distribution-sanity-phosphorus
+    csit-mri-list-sulfur: >
+      aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur,
+      controller-csit-1node-benchmark-all-sulfur, controller-csit-1node-rest-cars-perf-all-sulfur,
+      controller-csit-3node-benchmark-all-sulfur,
+      controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur,
+      mdsal-csit-3node-netty-replicate-only-sulfur, 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-sulfur
+    csit-weekly-list-sulfur: >
+      controller-csit-1node-notifications-longevity-only-sulfur,
+      controller-csit-3node-drb-partnheal-longevity-only-sulfur,
+      controller-csit-3node-drb-precedence-longevity-only-sulfur,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur,
+      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur,
+      distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur
+    csit-sanity-list-sulfur: >
+      openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 0050f6a4240485dda65324ea94ed9bd057dd6cf0..6183c161b676806a33d758dca77efa96cc9ffe05 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

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

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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 42be4bd8a1ee46ee140c320f55332c89b6ced2a6..5f0878d93c0389d723285bc4a194b6118a6a36e1 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:
@@ -55,7 +57,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           dependencies: >
             bgpcep-maven-merge-{stream},
@@ -67,6 +69,18 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
+      - phosphorus:
+          branch: "stable/phosphorus"
+          dependencies: >
+            bgpcep-maven-merge-{stream},
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            netconf-maven-merge-{stream},
+            neutron-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
       - silicon:
           branch: "stable/silicon"
           dependencies: >
@@ -116,10 +130,14 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
+      - phosphorus:
+          branch: "stable/phosphorus"
+          dependencies: >
+            distribution-merge-managed-{stream},
       - silicon:
           branch: "stable/silicon"
           dependencies: >
@@ -148,8 +166,10 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - phospshorus:
+      - sulfur:
           branch: "master"
+      - phospshorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0baa6db296b3f2f4311378433ec67f71c72c9c6e..63595dedd2e9d4dbf73eadf2bcc13d8bdab76fb3 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           mvn-version: "mvn35"
           java-version: "openjdk11"
+          csit-list: !include: csit-jobs-sulfur.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
+            bgpcep integration/distribution
+
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"
           csit-list: !include: csit-jobs-phosphorus.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
@@ -61,8 +71,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - phosphorus:
+      - sulfur:
           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-sulfur.lst
+          csit-mri-list: "{csit-mri-list-sulfur}"
+          csit-weekly-list: "{csit-weekly-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
           csit-blocklist: >
             aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -112,9 +135,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-sulfur}"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-phosphorus}"
       - silicon:
           branch: "stable/silicon"
@@ -167,7 +194,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 b494f0d131728ddbec5f41b232266d438295c852..910d7c468097feb76dee8d0e24cdc854ac15108c 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 11ba9beaf0eb615d5e8fbf330160f04672512e71..7880527bd39ba13bb86cf4e2d2390d077d31e7d1 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: jsonrpc-sulfur
+    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
+
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: sulfur
+    java-version: "openjdk11"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    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-phosphorus
     jobs:
@@ -15,7 +40,7 @@
     project-name: "jsonrpc"
     stream: phosphorus
     java-version: "openjdk11"
-    branch: "master"
+    branch: "stable/phosphorus"
     mvn-settings: "jsonrpc-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index f68f89b84953f535bbdbd05501253f1db693c664..aa00faa353fdc7fa81f1794f27661c1063d1c6cd 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 58003f09b7e39b39ade56134c2e6c922934824af..1beea9b9eeb3228904d56678b6faf39510e2e62b 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 6d36a960246949041f103f88b3017a6dfe150d6d..d2c3f3bd195f56daa098259a37efe9623bc6b72c 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: lispflowmapping-sulfur
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{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
+
+    stream: sulfur
+    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: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-phosphorus
     jobs:
@@ -15,7 +47,7 @@
     stream: phosphorus
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "master"
+    branch: "stable/phosphorus"
     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 54f92b6544889718d7eba555caeffcdca698bc1d..9e993e4c33e7c02cdc428c54c95bd96c3b2d880f 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
     functionality: "bindingv1"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index a20e4bd3a737202a45fb9dec1ce10fd491b8eaf0..79da29316a4c1e097bb658408237606670a09cba 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           install-features: >
@@ -21,6 +21,15 @@
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+          install-features: >
+            features-controller,
+            odl-mdsal-replicate-netty,
+            odl-restconf-nb-bierman02,
+            odl-netconf-clustered-topology,
+            odl-clustering-test-app
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 49838f97e270eb1a1ade27cb107948df4b5fc23e..a298aba697f3d147d677f039156cbf5239af4a58 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "mdsal"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index a08f3c28870fe91b608d07d72bc894a1b6ef9c57..0ce1f29409d4b6c471a148233bff18aa020732af 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -54,13 +54,20 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
+            \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
+            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 9a50648689633748edeb8509d28b07845cf7b587..f99457a1faa7b742597c54f539daccb58d98d7ef 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -97,10 +97,14 @@
     project: "netvirt"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
 
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 3e79e321f4d9bc37a1cc5edbcdcfccbbe1a82bca..f38f9f9fe24e31f511cd7ede4794b8ec3d4ca72f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -51,7 +51,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -83,7 +83,7 @@
     name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     stream: "silicon"
@@ -132,7 +132,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -212,7 +212,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -245,7 +245,7 @@
     jobs:
       - inttest-csit-openstack-custom
 
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     stream: "aluminium"
@@ -294,7 +294,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -327,7 +327,7 @@
     jobs:
       - inttest-csit-openstack-custom
 
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
@@ -341,10 +341,14 @@
     os-cmp-cnt: 0
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
 
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
@@ -379,7 +383,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
       - tempest-stateful:

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 9a5f57dd61fb31c77611b0ee5cc744c0683a5d46..40e9cd764526ff44dc512a057569996bec1e427d 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "netvirt"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index d4de8d2b8cac4fb1789ea9f27cf766d07b3b56ce..47c112752c656497a3f29a4308cc3cc9c74fca32 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "neutron"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 5cd316bb6e10af892848012186b9f2d8276f081c..61c05a2e37af821e564627c02458e75722bd931b 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -10,7 +10,7 @@
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
-    branch: "master"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "neutron-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index a5ff2f7316f0390f053e5ca0ae8551ad85ffaaaf..63bcb300dc926884dea7ec2a440d9d792b21cd6e 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -13,7 +13,7 @@
 
     # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           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
+      - phosphorus:
+          branch: "stable/phosphorus"
+          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
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
@@ -59,7 +67,7 @@
 
       # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           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
+      - phosphorus:
+          branch: "stable/phosphorus"
+          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
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
@@ -125,7 +145,7 @@
 
       # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           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
+      - phosphorus:
+          branch: "stable/phosphorus"
+          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
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index 978ba1e0f201067c16669bcc14bc82265f413c07..f649de10fa45413b839d4c56613faa3ff0db6791 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: odlmicro-sulfur
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: sulfur
+    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-phosphorus
     jobs:
@@ -8,7 +27,7 @@
     stream: phosphorus
     project: odlmicro
     project-name: "odlmicro"
-    branch: "master"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     build-node: centos7-builder-2c-2g
     build-timeout: 60

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index 8939180cc0e1633729fcd08993702f3b99ae9a27..2c3e869122fec7e0c071b544bed6119f21f812f1 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "odlparent"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index 2c5cf969ebfbfff570ffe6975023e8b22d1e3bb8..fdc196aa615e44ab2674aed32d384b47e11c8ba7 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: odlsaf-sulfur
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: sulfur
+    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-phosphorus
     jobs:
@@ -10,7 +30,7 @@
     project-name: "odlsaf"
     build-node: centos7-builder-4c-4g
     build-timeout: 120
-    branch: "master"
+    branch: "stable/phosphorus"
     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 23a14691a541fe8f8c3a1eeec2cbe3e9eb44cf1a..55f28bc2b244e4a2c574d5cfa8b08e15b6d428d7 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,9 +10,12 @@
     testplan: "{project}-basic.txt"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index 9a813510a05268ea597750f8ee7b51b3dfe86550..98bb1619fd3a15028a14a6f6db76e94ce6029346 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 392846bcccceeb91332de553d50e216dcde2ba6d..b89ff1e0d69377070c5d7ef4387ab0ef688b2bbf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index a66083d135cff88a0f066c00128d822961ad1367..95abb00bca01af703c0a9afd2cf6f1a154ff14a4 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 21ff1794a63c200f76a1cdf4928ce603287d5a0b..ffe8551fbd619a0237723eddc8267f224b8cecdf 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index ecb5d8c3be483f4854569d1263d0108bbc22b7fe..442feb4381ba44904c68c6364009ba315242bf10 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
           install: "all"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+          install: "all"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3f0b4e17dcae26a7a043e581fc72fe9a63ae5f08..594d4efecefe017644b139f5f54f6cc327b59d98 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -12,13 +12,16 @@
     functionality: "longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    #elasticsearch-attribute: 'long'
+    # elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 2918f17b240e1ca8b7f0b9915b880e111a87f482..3f91d3d6e959b5c8f292680eae54a145045357ba 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 58a20d294c68790a26113ea8619802f6ac7ed288..793c268254eb1c767937a29917fb6a1f92fe784d 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 02817a04c5b5dcea094ac4a5ee62125924b2c89e..e01b5a988af623f5734339cef15fbe1ba30c66b3 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index d4baa939dde3f7295e02a5fb23e20512a80c8ef9..1d81ea8ccb7b838974d1a14c12b0ac3f24bc325c 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 216d021108482789ef641b1b943988bbe47cb99c..5baebd08922a5da109dc123b42e9cf21520e9444 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 3758d413527b50c045e2653b9689e75603bae1b7..e924c905f5b3f8c416a35505ec8ac2cf60260614 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: openflowplugin-sulfur
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{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
+
+    stream: sulfur
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos7-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-phosphorus
     jobs:
@@ -16,7 +48,7 @@
     stream: phosphorus
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "master"
+    branch: "stable/phosphorus"
     build-node: centos7-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 d1a6f8f48b4333feba546bc025b2da5ec15757c4..488c44195c862e8e2bbffb80039067ee40e78049 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

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

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index bd23250509168bd99b22924b426ef60602cbc96e..4c5a59869ef85f1d89f3ec208b4806585edaadc2 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:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           java-version: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          java-version: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 173b31ba22a7584543d434c776231565154351d3..094b331fcecf8cf2b2f2b2ab7bf749255cc4e952 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: ovsdb-sulfur
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{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: sulfur
+    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-phosphorus
     jobs:
@@ -15,7 +41,7 @@
     stream: phosphorus
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "master"
+    branch: "stable/phosphorus"
     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 b2ea5b1b5007a0f8943d73dac5398c27c4082f60..769d2791912566710b250eb5a614409d75fd3f96 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: p4plugin-sulfur
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: sulfur
+    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-phosphorus
     jobs:
@@ -9,7 +28,7 @@
     stream: phosphorus
     project: "p4plugin"
     project-name: "p4plugin"
-    branch: "master"
+    branch: "stable/phosphorus"
     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 a38df8164ce3dc77d2fd5d33c5ee4927d0762449..ceacfd0e7732f0e23f210282c0f96b2947b7af6c 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "serviceutils"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
+      - phosphorus:
+          branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
       - aluminium:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 50ba04b5c607ed9a1f835c03230a20221a8137c7..91e4af944b4fd3e93bbcd8a91845d50a3244b1e4 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-phosphorus
+    name: serviceutils-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -13,6 +13,38 @@
       - odl-maven-verify-jobs
 
     branch: "master"
+    stream: sulfur
+
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos7-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-phosphorus
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{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
+
+    branch: "stable/phosphorus"
     stream: phosphorus
 
     project: "serviceutils"

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index c49b9c9ab3c8322144b992cf2430d343cb72760f..c86a03abd13d80850740621610ee155792a7b041 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index fc1ddf4e0f9b728f0d1bdfb892ee45e2791860de..eb3101fd92e1279600c342e2eb85ed672a72e9dd 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 6b6e7cab8192a6185f35419a3da491de33ca38c5..48f637f45c6378a6fdd5819e2275e497aa3f7d26 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 3d01a6f79383b9f07ad7692fb6df405327f838dd..1ddb45095d89b5fe98d8abdef2774da2a22f6485 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 2b932a3479d3334db501a6c61254d76ab5b4e9af..3b85253e4b42f311388f818b1cb96ac184189bf1 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index a981c15255b96ea06982eef026ed5b6f27cd0ead..5d692f33d75ae7fd9911dd7fd7a4ddb94e2309d1 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 2190c0fc42854cdea05fb1df8fe7fe182b3ad2de..b7164740e71720bc017b63d0903ea947e4bfb8a3 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1221bf20d4ffca3e124589a0fc5cd2bd191ce293..19eadca362c988eb42c4d4f5ee659477879cf458 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: sxp-sulfur
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    java-version: "openjdk11"
+
+    stream: sulfur
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
+
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
+
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-phosphorus
     jobs:
@@ -15,7 +42,7 @@
     stream: phosphorus
     project: "sxp"
     project-name: "sxp"
-    branch: "master"
+    branch: "stable/phosphorus"
 
     mvn-settings: "sxp-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 2f07ab50c1efb377c16fc4db63464cb9d921b2db..24c8c8e1e735f90592f50e24820c831423570fa7 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: transportpce-sulfur
+    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: 240
+          build-node: centos7-builder-4c-16g
+          parallel: true
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: "transportpce"
+    project-name: "transportpce"
+    stream: sulfur
+    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-phosphorus
     jobs:
@@ -17,7 +45,7 @@
     project: "transportpce"
     project-name: "transportpce"
     stream: phosphorus
-    branch: "master"
+    branch: "stable/phosphorus"
     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 40e9ceda7c176aa347f73aa466c17f81b22d894e..28752cde1b3e0b3a18ff5053c4c00694f1d407f0 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,9 +12,12 @@
 
     # Project branches.
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index 142d7e71af6ff7636bb5036bd6eea758bd38c933..18fca33755d71ed03c6ce4daadd0d8bd9db5f15f 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "yangtools"
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
       - silicon:
           branch: "6.0.x"
           jre: "openjdk11"