Branch cut for stable/silicon stream

master is moved to next release (phosphorus).

Issue: https://jira.linuxfoundation.org/browse/IT-21581
Change-Id: Ic801cace3c3a06c0f27599be9a1931e6cdc92596
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 73c4d663ec89987f3de842ddb8f69b139bb96af4..0a771869fba28b5e4596e69174e269a73cd3f351 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index 27268433548804a71ccc151a6e93944d341c425b..638748d451054167f3f38d564867bd9a4ca5c711 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: alt-datastores-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: alt-datastores
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
+          rtd-token: dc412b0cc43fba4098173878f970e76380ce0084
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "master"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[alt-datastores] [odlparent] [yangtools] [controller]"
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: daa2b00117ed6
+
 - project:
     name: alt-datastores-silicon
     jobs:
@@ -13,7 +37,7 @@
     stream: silicon
     project: "alt-datastores"
     project-name: "alt-datastores"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "alt-datastores-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"

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

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 1672c402c376234dc0066c8f98f8c86d866928a5..000aa2fe88454ecf341a5c748000183e4f6705e5 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 1c2b4594cac32544b6a10202b48f19a82db04792..03f5e8120dee79ca379c8c8fccd4a86263371bf1 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index a354549042ddb21ad4ad041cdfa5d07708a5740b..7b08a561200c23797f81bf9325ad0de09c6b31a6 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -3,7 +3,7 @@
     name: bgpcep-csit-bgp-ingest
     jobs:
       - inttest-csit-1node
-      # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
+        # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
     project: "bgpcep"
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 876dc6350288a0b0989c5d3ed72ee99a855a7031..4fba92afd48dd2da3ed27e24a2d07c7161774233 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 05595801cd2fa9eabe985a31a7040a70f890d3c4..395663e025152a649763a3e4bdd11bbeb3651e93 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

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

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

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

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 81bbf70478ea96a3474996dd1835986dae1de66c..0639290df069c1f88e21c1236b5b2699a3d2fed6 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: bgpcep-phosphorus
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: bgpcep
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
+          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "bgpcep"
+    project-name: "bgpcep"
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx2048m"
+    dependencies: >
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-silicon
     jobs:
@@ -17,7 +49,7 @@
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 85f6517558e3e6ca0b07b6b1df7f4df76e571d03..946e7a12d6a3f8f526d2a55cae233f520b520c05 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index f80d7ac7aa8035115e468a9c53161bc5e6eaa709..a437c2a1529dd613aa7599cd2ad47d54f9d63d23 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,4 +1,25 @@
 ---
+- project:
+    name: bier-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "bier"
+    project-name: "bier"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-silicon
     jobs:
@@ -8,7 +29,7 @@
     stream: silicon
     project: "bier"
     project-name: "bier"
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: "bier-settings"

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 23104b16618939234c970826c0b0ddd961e258ee..f8e18bc1e425c27b44855d47124ee8cad987c7ca 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coe-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: "coe"
+    project-name: "coe"
+    stream: phosphorus
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-silicon
     jobs:
@@ -13,7 +38,7 @@
     project: "coe"
     project-name: "coe"
     stream: silicon
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "coe-settings"
     mvn-opts: "-Xmx1024m"

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

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

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index f7c374bf3fa697c4025c983a0fbebefcf64fde54..70b4b7f0e14ec3efc2f19765b2c29f4175cbc947 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index e079a4e17b9310d753e02da4d86cee7ef387c71a..40587064e92ac65bd23edc42d15d6d6ba65b1711 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           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 2c40dce9cf231123e12f4b0941704a4adfb5b268..46b6a29ccda926beb8561b6b0791f781dd305fa5 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 22abf952db0d28627614e0de42441c98f6b94f8c..bef44f11dd00f09550e8972c5bc097c9ccc8af54 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 4420b17f0fe3283120981b1467fcf7b37a581663..de489b8e48c6a101b0560048eee90edfaeb3ff08 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 4756dbf8450551a7b5bf999367801cd5eb0cc2da..fc3890e4c24afe8a4e5b2d34eb98f36939ec747f 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 32907037b2d16a18d8d9baa32c05a65b9d2a7f94..88a54f8ed32c874043b93738200b75cf9a000dc9 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 9038123d094dc717fdf7ff6f770749f1f595fbfd..7cad11d8954664e95c6703cb14bc2726cb8f985f 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index b29b2ca566fd04bc54787192daea69e9e7f79313..9ab8573ae37bcdbe080964e7f5458f9d95fe503e 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           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 cc683e28a3f55fbcfe453d9c74138df2fb10b5e3..5a9c6228605895808b0848077e531e06b7196b07 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index 6a12e7faac1fb1710284e6de5aaef84de3e9a943..1fa23f4be498314fc41519122a53ee8513474472 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "controller"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 7b3255a5901379d8f7a45c85fa25e402f7772866..ba58c6d391e4a2ac2a57c889557e07018c164126 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 26b3f5eb6d9c9728963d6fa3368713399089a874..f442b3824d9e39d46ada3766b923b3d1dfb5529f 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 4f440af00aa22190d75dca0703790a750db53250..a90c876a62d79a0faea7898eb69337e24bedd5f2 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -254,3 +254,26 @@
       distribution-deploy-magnesium,
       distribution-offline-magnesium,
       openflowplugin-csit-1node-longevity-only-magnesium
+    csit-mri-list-phosphorus: >
+      controller-csit-1node-akka1-all-phosphorus,
+      controller-csit-1node-benchmark-all-phosphorus,
+      controller-csit-1node-rest-cars-perf-all-phosphorus,
+      controller-csit-3node-benchmark-all-phosphorus,
+      controller-csit-3node-clustering-ask-all-phosphorus,
+      controller-csit-3node-clustering-tell-all-phosphorus,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-phosphorus,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-phosphorus,
+      mdsal-csit-3node-netty-replicate-only-phosphorus,
+      yangtools-csit-1node-system-only-phosphorus
+    csit-weekly-list-phosphorus: >
+      controller-csit-1node-notifications-longevity-only-phosphorus,
+      controller-csit-3node-drb-partnheal-longevity-only-phosphorus,
+      controller-csit-3node-drb-precedence-longevity-only-phosphorus,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-phosphorus,
+      bgpcep-csit-3node-bgpclustering-longevity-only-phosphorus,
+      distribution-deploy-phosphorus,
+      distribution-offline-phosphorus,
+      openflowplugin-csit-1node-longevity-only-phosphorus
+    csit-sanity-list-phosphorus: >
+      openflowplugin-csit-1node-sanity-only-phosphorus,
+      distribution-sanity-phosphorus

diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml
index d407270024fb68bcb584e68167b1edd2e0395f1a..1554246c471b1a58663c2189d8ecbb1fbd0ef706 100644 (file)
--- a/jjb/detnet/detnet.yaml
+++ b/jjb/detnet/detnet.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: detnet-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: detnet
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
+          rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "detnet"
+    project-name: "detnet"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "detnet-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[detnet] [odlparent] [yangtools] [controller]"
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 8981976d0fea7
+
 - project:
     name: detnet-silicon
     jobs:
@@ -13,7 +38,7 @@
     stream: silicon
     project: "detnet"
     project-name: "detnet"
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "detnet-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 867cd6c3334432d5fa80e3f55ef48774d90fde0c..127aa212c50e0dcfd15f0b9003d8665ac7779948 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index e1fba2c64cf675f9926e4f2271e8ec8a825881d6..f82822e96812d8b175199034194457c712a00214 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: dluxapps-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    project: "dluxapps"
+    project-name: "dluxapps"
+    stream: phosphorus
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-silicon
     jobs:
@@ -8,7 +28,7 @@
     project: "dluxapps"
     project-name: "dluxapps"
     stream: silicon
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     mvn-settings: "dluxapps-settings"
     mvn-opts: "-Xmx1024m"

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

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 05e7b801762f01edb2b7ac57e82a2a9ef6aa8feb..78b1f789b2707aa4d500240cea949365e9a4f71d 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -16,9 +16,12 @@
     testplan: "{project}-{functionality}.txt"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 8a9ab8a795a82232937434e5bb68c9cab3156e15..59c108fc3ca50ee0666874df4b14c8e28c2fc1d3 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "genius"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 85afc5bafcbb85414cba268bcb05f7d06b5fd05f..e901919e9578cc4520e24a416966ca6db2d2cb90 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,4 +1,38 @@
 ---
+- project:
+    name: genius-phosphorus
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: genius
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
+          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"
+    build-timeout: 90
+    dependencies: >
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-silicon
     jobs:
@@ -14,7 +48,7 @@
     stream: silicon
     project: "genius"
     project-name: "genius"
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "genius-settings"
@@ -26,7 +60,9 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
@@ -59,7 +95,9 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
@@ -92,7 +130,9 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index e5aea59abe08a0d8d5e2af9f81b605c1d7246a97..940ed771e63100ea2a0230eb2a67afbf4f5652c2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,4 +1,33 @@
 ---
+- project:
+    name: groupbasedpolicy-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"
+    build-timeout: 90
+    dependencies: >
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream},
+      sfc-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream:
+      "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\
+      \ [sfc] [ovsdb]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-silicon
     jobs:
@@ -8,7 +37,7 @@
     stream: silicon
     project: "groupbasedpolicy"
     project-name: "groupbasedpolicy"
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     mvn-settings: "groupbasedpolicy-settings"
     mvn-goals: "-U clean deploy findbugs:findbugs"
@@ -20,7 +49,9 @@
       neutron-merge-{stream},
       sfc-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"
+    email-upstream:
+      "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\
+      \ [sfc] [ovsdb]"
     disable-job: true
 
     # Used by the release job
@@ -47,7 +78,9 @@
       neutron-merge-{stream},
       sfc-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"
+    email-upstream:
+      "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\
+      \ [sfc] [ovsdb]"
     disable-job: true
 
     # Used by the release job
@@ -74,7 +107,9 @@
       neutron-merge-{stream},
       sfc-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"
+    email-upstream:
+      "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron]\
+      \ [sfc] [ovsdb]"
     disable-job: true
 
     # Used by the release job

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

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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0a82bbdf25a3de1c8376bd5d77d13e32456371c5..f4461f6a8aceca6927f6741550d7f035a6b7943d 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           mvn-version: "mvn35"
           java-version: "openjdk11"
+          csit-list: !include: csit-jobs-phosphorus.lst
+          build-order: >
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
+            bgpcep integration/distribution
+
+      - silicon:
+          branch: "stable/silicon"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
@@ -61,8 +71,21 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+          csit-blocklist: >
+            bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
+            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-phosphorus.lst
+          csit-mri-list: "{csit-mri-list-phosphorus}"
+          csit-weekly-list: "{csit-weekly-list-phosphorus}"
+      - silicon:
+          branch: "stable/silicon"
           csit-blocklist: >
             bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
             netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
@@ -115,9 +138,13 @@
       - "integration-sanity-test-{stream}"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           karaf-version: odl
+          csit-sanity-list: "{csit-sanity-list-phosphorus}"
+      - silicon:
+          branch: "stable/silicon"
+          karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-silicon}"
       - aluminium:
           branch: "stable/aluminium"
@@ -170,7 +197,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:
@@ -331,7 +358,7 @@
             -Pq
             -Dstream={stream}
             {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+            # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - "-Xmx4096m -Dmaven.compile.fork=true"
           settings: integration-settings
@@ -344,7 +371,7 @@
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
             {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+            # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - "-Xmx1024m -Dmaven.compile.fork=true"
           settings: integration-settings

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index dc29dc04f2571833d75c0cb15007c96ee9792916..504c1dcb2c3b1a9cf76c3f02b32f408bace4d649 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index c1775f058dd1ed1bfe093851452451dd9e74e9f8..2d193a1c500bf39f391133cbae50198a1a2ecd89 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: jsonrpc-phosphorus
+    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: phosphorus
+    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-silicon
     jobs:
@@ -15,7 +40,7 @@
     project-name: "jsonrpc"
     stream: silicon
     java-version: "openjdk11"
-    branch: "master"
+    branch: "stable/silicon"
     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 48fb783460d757f36b8a178b29475ded51beba0d..e389d7988ca8fb22d45f6f52dd6a2730ee239e7a 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

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

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 32a4ec7f89164144cdc26f0237c8a9ce7447662c..23f6beaecb8c147c608ce6ee289d90539ab2f74f 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: l2switch-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
+    dependencies: >
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream:
+      "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
+      \ [openflowplugin]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-silicon
     jobs:
@@ -8,7 +34,7 @@
     stream: silicon
     project: "l2switch"
     project-name: "l2switch"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "l2switch-settings"
     mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
     dependencies: >
@@ -17,7 +43,9 @@
       controller-merge-{stream},
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream}
-    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"
+    email-upstream:
+      "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
+      \ [openflowplugin]"
     disable-job: true
 
     # Used by the release job
@@ -41,7 +69,9 @@
       controller-merge-{stream},
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream}
-    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"
+    email-upstream:
+      "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
+      \ [openflowplugin]"
     disable-job: true
 
     # Used by the release job

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index ebeadb63aa056a8424c838d6352eb1d1ee847da1..25598d58fdd437eed00b627428d4f68a74149e5d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: lispflowmapping-phosphorus
+    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: phosphorus
+    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-silicon
     jobs:
@@ -15,7 +47,7 @@
     stream: silicon
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "master"
+    branch: "stable/silicon"
     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 94ed4421fc41454167ed60cc331244991350ea44..c5ed3ba394d89332247eaac5f23e4f7ed5a6f311 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
     functionality: "bindingv1"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
index 266185602efc8f295f7e3979ecec2c93a5fd0f84..bedb8fba56691fe6270d2a5f4a89ae4d2cf995b2 100644 (file)
--- a/jjb/mdsal/mdsal-csit-netty-replication.yaml
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 79cb62eb56103bb8d70a5e00030bb0e45664af66..8c5096c919ac78da0f809e2f607cd2961bf36ee6 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "mdsal"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 94a514799104a2589484a833815dd7639a9c5d1e..f5117303f6b41b2cf9a00a6637c2ff089419c53b 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 827bc49d7810037363fd04394bb1af1a6831e5f9..210a975ad2ec05c3ea1414f171e43cad824fed7b 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: nemo-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "nemo"
+    project-name: "nemo"
+    branch: "master"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[nemo]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-silicon
     jobs:
@@ -8,7 +27,7 @@
     stream: silicon
     project: "nemo"
     project-name: "nemo"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "nemo-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 0c3e439e3e0090e5358921497c80509cfd3f0034..03083928fc0909a0a62f95544d326df655178548 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 83b079bc5f63422b0db2d1afa0cd8cb4f62a5fcc..4119d427f45add37acd8197680a86b1ae2e98ce4 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index e5a644677969a3f11e31660ae0aed0546c7119fd..2b6d9dea2a0db084a59fa03f4dca8b112922aabd 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index ac880062c41a879af687071eef3493db949525a5..b86f948d2f42b85639112345a3e0910f8be19a0d 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "netconf"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 050e557fbb59a66b18040a9127d2126f25e485e6..94532319e7e0d08d6769ffe400a10b5e8a0924a4 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
@@ -52,27 +55,34 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
           robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400
-            -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200 -v TESTTOOL_BOOT_TIMEOUT:600s
-            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
+            \ INIT_DEVICE_COUNT:400 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200\
+            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
+            \ INIT_DEVICE_COUNT:400 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200\
+            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
           robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:1000
-            -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500 -v TESTTOOL_BOOT_TIMEOUT:600s
-            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
+            \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500\
+            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
           robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
-            -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
-            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
+            \ INIT_DEVICE_COUNT:250 -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100\
+            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
 
     install:
       - only:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 888be65d885489821f48ec0544499879a1385cfe..ec9e174c7e8566ea9f674ccbf9179d9f4fb7a2b5 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -18,9 +18,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 179dbdc7a740e6e5b9626249f4f338ce2ca88b2f..83b4f6d524c7527f29a0ff8431ed25fd1b58a7b5 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -104,10 +104,14 @@
     project: "netvirt"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
 
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+
     testplan: "{project}-{topology}-openstack-upgrade.txt"
     odl-ml2-driver-version: "v2"
     enable-openstack-services: "placement-api,l2gw-plugin"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c80780b6a6507389980fd2d4a47a3e2bb13a520f..fcea3919190adf457d16ebdddfcbf55864cb2e84 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"
           schedule: "{schedule-weekly}"
@@ -135,7 +135,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"
           schedule: "{schedule-weekly}"
@@ -218,7 +218,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"
           schedule: "{schedule-weekly}"
@@ -303,7 +303,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"
           schedule: "{schedule-weekly}"
@@ -392,7 +392,7 @@
           tools_system_count: 3
           schedule: "{schedule-weekly}"
           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"
           schedule: "{schedule-weekly}"
@@ -473,7 +473,7 @@
           odl-snat-mode: "conntrack"
       - gate-minimal-cluster:
           testplan: "{project}-{topology}-minimal-openstack.txt"
-      # 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"
           schedule: ""
@@ -554,7 +554,7 @@
           odl-snat-mode: "conntrack"
       - gate-minimal-cluster:
           testplan: "{project}-{topology}-minimal-openstack.txt"
-      # 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"
           schedule: ""
@@ -602,10 +602,14 @@
     os-cmp-cnt: 0
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
 
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+
     topology:
       - 1node:
           openstack_system2_count: 0
@@ -640,7 +644,7 @@
           tools_system_count: 3
           enable-gre-type-driver: "yes"
           schedule: "{schedule-daily}"
-      # 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"
           schedule: ""

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index f67686067dc002cabcdbf8d75eeb69d7717b5cfd..056fbac0150e2197ba9ddba1732d7a596970b0b0 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,4 +1,42 @@
 ---
+- project:
+    name: netvirt-phosphorus
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
+      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    branch: "master"
+
+    project: "netvirt"
+    project-name: "netvirt"
+
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"
+    build-timeout: 90
+    build-node: centos7-builder-8c-8g
+    dependencies: >
+      genius-merge-{stream},
+      neutron-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
+
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
 - project:
     name: netvirt-silicon
     jobs:
@@ -14,7 +52,7 @@
       - odl-maven-verify-jobs
 
     stream: silicon
-    branch: "master"
+    branch: "stable/silicon"
 
     project: "netvirt"
     project-name: "netvirt"
@@ -30,7 +68,9 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -67,7 +107,9 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -104,7 +146,9 @@
       openflowjava-merge-{stream},
       openflowplugin-merge-{stream},
       ovsdb-merge-{stream}
-    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"
+    email-upstream:
+      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
+      \ [ovsdb]"
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index 783fc8195d7d0e665759c319c0ce907fc2a51629..6c3f0f443d89544d33357c44cfea3a87fc886973 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "neutron"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 82ae533cfeacbc05351b4efac82a805f30894a82..0e95f91d9d7add911f96965af10ba9e6438d5cce 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: neutron-phosphorus
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "neutron"
+    project-name: "neutron"
+    build-timeout: 90
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-silicon
     jobs:
@@ -11,7 +33,7 @@
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
-    branch: "master"
+    branch: "stable/silicon"
     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 f6efcb9e2fa0cafb59c45051fdeeba57cad3e988..a5ff2f7316f0390f053e5ca0ae8551ad85ffaaaf 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -13,7 +13,7 @@
 
     # Project branches.
     stream:
-      - silicon:
+      - phosphorus:
           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
+      - silicon:
+          branch: "stable/silicon"
+          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
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
@@ -51,7 +59,7 @@
 
       # Project branches.
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-devices-scale"
@@ -63,6 +71,18 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
+      - silicon:
+          branch: "stable/silicon"
+          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
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
@@ -105,7 +125,7 @@
 
       # Project branches.
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf-general-scale"
@@ -117,6 +137,18 @@
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
+      - silicon:
+          branch: "stable/silicon"
+          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
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index b2a1e76800bf32539c1ce611f7175c5950a92cea..978ba1e0f201067c16669bcc14bc82265f413c07 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: odlmicro-phosphorus
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    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-silicon
     jobs:
@@ -8,7 +27,7 @@
     stream: silicon
     project: odlmicro
     project-name: "odlmicro"
-    branch: "master"
+    branch: "stable/silicon"
     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 a89a46509ab86aa19efc5e6f6368783ac8112952..d965488c552572c244543194188a56eede736905 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "odlparent"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

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

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index ea11a72002b5338bfa92d090bc514464205b1fed..169fedf3fd92f09d01cc096def31b2c84eaa2954 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 56b5fa56b6836ebf9d5d79d49e534a96f6812b03..ca574c2aac7155de453f958fa72248e7b12fe8b8 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: of-config-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "of-config"
+    project-name: "of-config"
+    branch: "master"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: netconf-merge-{stream}'
+    email-upstream: "[of-config] [netconf]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-silicon
     jobs:
@@ -8,7 +27,7 @@
     stream: silicon
     project: "of-config"
     project-name: "of-config"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "of-config-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: netconf-merge-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index b45d55a7d8c83943ad2bcfdc28830cd35819f3e2..15beb0293ebbb8a7598e980e98c6469e91d5c71a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -10,9 +10,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 9e1bdada458e5fff9956683767e0ae0a14af6068..75aa05d30b6aef69dcb7e39b28c5af7181121b7c 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 813769bcfbd6c4d6506007bc15b6f4558cf500db..5b8f2e2cbc1e52ed2688338f35de0239796a5b6c 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 939796b3b453ad52ca0d0dc422691ad670af4230..752e0c0c04b232b64fa40118bdac5722a7cbfbef 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -16,9 +16,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 52222574e8b2f89138a7c98811506795674f7fdc..0daba874354e1edf8d50e1b58a7c62d02271bdce 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index d6d6141c26d59a771ff023b9fc51e8e940b0c975..9fab2adcd35df8a7cde917b6696953fd8838c236 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index f821b47a0d2215b7b938962ce43d44e38f26c245..297eca372b14a9853b008479df5566a00a87a50c 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 554894418a55ad155793f6089248f31f4ce2fd17..9b8613c9a99615f32ad860e056167c4abe131d63 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 255010acfd390a6c72d6c63264b5abc3f4a0f2f3..4b2667902181b9720e13fe57b135f1cffa8b5069 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,38 @@
 ---
+- project:
+    name: openflowplugin-phosphorus
+    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: phosphorus
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"
+    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-silicon
     jobs:
@@ -16,7 +50,7 @@
     stream: silicon
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: "openjdk11"

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index d686683215ecaf81a4059120eac4a4d9ab6b3dc9..6977b77b937d383d2d00998ca3faf006dadd6b7c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,11 +6,16 @@
       - "opflex-merge-{stream}"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           libuv-version: "1.20.2"
           rapidjson-version: "1.1.0"
           openvswitch-version: "2.12.0"
+      - silicon:
+          branch: "stable/silicon"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"
       - aluminium:
           branch: "stable/aluminium"
           libuv-version: "1.20.2"
@@ -49,18 +54,21 @@
           refspec: "refs/heads/{branch}"
           artifacts: "{archive-artifacts}"
       - string:
-          name: LIBUV_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            LIBUV_VERSION
+            # yamllint disable-line rule:line-length
           default: "{libuv-version}"
           description: "libuv version"
       - string:
-          name: RAPIDJSON_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            RAPIDJSON_VERSION
+            # yamllint disable-line rule:line-length
           default: "{rapidjson-version}"
           description: "rapidjson version"
       - string:
-          name: OPENVSWITCH_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            OPENVSWITCH_VERSION
+            # yamllint disable-line rule:line-length
           default: "{openvswitch-version}"
           description: "openvswitch-version"
 
@@ -110,18 +118,21 @@
           refspec: "refs/heads/{branch}"
           artifacts: ""
       - string:
-          name: LIBUV_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            LIBUV_VERSION
+            # yamllint disable-line rule:line-length
           default: "{libuv-version}"
           description: "libuv version"
       - string:
-          name: RAPIDJSON_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            RAPIDJSON_VERSION
+            # yamllint disable-line rule:line-length
           default: "{rapidjson-version}"
           description: "rapidjson version"
       - string:
-          name: OPENVSWITCH_VERSION
-          # yamllint disable-line rule:line-length
+          name:
+            OPENVSWITCH_VERSION
+            # yamllint disable-line rule:line-length
           default: "{openvswitch-version}"
           description: "openvswitch version"
 

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index aa65f175baaff73262878e4225ed786012067d86..428ddbe1c0f52e008477c0e817f37cb3e094abd6 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index fdbe98a0cc4507609c852f0e5e2551580fc6f9b7..04a0ea1b87cbae2b3c0920d624af248cf2524df9 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index dabb4fbbea13b5bd27b96d15e607950ea9d81c1c..0b0a0072ab4ff43b56433525801f894e9f3501a3 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,9 +8,12 @@
     project: "ovsdb"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 5955558ba555a8cdbbe70cb54cb47b41bc8d001f..ca2647613d3d46d2424fb4ece99c24a5b7df3ea1 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ovsdb-phosphorus
+    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: phosphorus
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    java-version: "openjdk11"
+    mvn-settings: "ovsdb-settings"
+    mvn-opts: "-Xmx1024m"
+    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-silicon
     jobs:
@@ -15,7 +42,7 @@
     stream: silicon
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "master"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index c8832f824dc140c8e7be6c45f20392745b99bbf2..69d3e9e1ded3c34bacffeea58c5daf9b9a11179a 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: p4plugin-phosphorus
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    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-silicon
     jobs:
@@ -9,7 +28,7 @@
     stream: silicon
     project: "p4plugin"
     project-name: "p4plugin"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "p4plugin-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 090f53e52246150583da2cf177167a607e427ea8..b39ec57f195fd1e4df69f1ecc79dbb82caa51329 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index fa9744e3c5d08f561ed8a2de050b8fd20603f8f0..f67129aefd8e930bb53e1c7f11e0d2af5602784d 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: packetcable-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "master"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[packetcable]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-silicon
     jobs:
@@ -8,7 +27,7 @@
     stream: silicon
     project: "packetcable"
     project-name: "packetcable"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "packetcable-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index b435eab946890157707e311ff2cbe737a8bbf9a7..aa2e7fa022e9bc355f80d8210cdd0d974aad8f00 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,8 +7,10 @@
     project: "serviceutils"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 4926281f72a926a72567ddf60d22f7239b45cf9a..9a9656900b6c0d2aaf6897584393ba9a1c2be92e 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-silicon
+    name: serviceutils-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -13,6 +13,39 @@
       - odl-maven-verify-jobs
 
     branch: "master"
+    stream: phosphorus
+
+    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-silicon
+    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/silicon"
     stream: silicon
 
     project: "serviceutils"

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 50674360c1cd0637c25f46fcdd66557dbaac8925..810c901ac4af2e9ccfb174856ea1643ecf7e7f70 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 7a11c799ceaecaf0e3a81f0eadf92a03bd4bdd67..1dc97267ead4aa1d28c8cdd4fb31e3c3d987554d 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index 3ea6e59d6e2d7a4bb77ee681c3a831411c2ae78b..0f67df687ad59f1eb166ff6164bd8fdd38d516cd 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           java-version: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index e690bfd593fd952d153ee7e534c7be3143e89d12..1bd4f5d99839a9bec2be7d81dcc1dc9e66402d42 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -5,8 +5,10 @@
       - "gerrit-tox-verify"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
+      - silicon:
+          branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
       - magnesium:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a18958e0e36a89ec902e2699e6c11aa25293b07e..a02fee1db2a1971394f85922ab440e509db4c992 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sfc-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: sfc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
+          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "sfc"
+    project-name: "sfc"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    build-timeout: 120
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-silicon
     jobs:
@@ -13,7 +39,7 @@
     stream: silicon
     project: "sfc"
     project-name: "sfc"
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "sfc-settings"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 0f07d2e6f44851ca9764a42a152948e96a9003bd..31bf3eb5a175b28cb408293adeda2405901b446c 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: snmp-phosphorus
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "snmp"
+    project-name: "snmp"
+    branch: "master"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[snmp] [odlparent]"
+
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-silicon
     jobs:
@@ -8,7 +26,7 @@
     stream: silicon
     project: "snmp"
     project-name: "snmp"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "snmp-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 6025519f9fbc324cb47d44b75ae05921af09bbc4..7fb6aa10abb9c2481627206b27e2841f2af41543 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: snmp4sdn-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: snmp4sdn
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
+          rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "master"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-silicon
     jobs:
@@ -13,7 +36,7 @@
     stream: silicon
     project: "snmp4sdn"
     project-name: "snmp4sdn"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "snmp4sdn-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"

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

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index 2d1f803192723bce3b6bcf101695181a82f4861b..4f206daadc3c401640d0a0344ee2e6a4465722ca 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 89e24da5a31f3543456c63a4fea35ab627914bdc..000e42a35707d36970b31dc151e1d50bbde2519e 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:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 22dae0ec771c56f75c7c337d3cacee9db1fa6dd2..f9abe90f4e96ce42c1bcd7ec03464bcd11cec5f1 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 08f5578aa570820fc8f121d51bac046fce5c2445..f75dff42ed6b3eb283e341fa157fc62c8ebb32e4 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

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

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

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index d78ccf77eef9faa4d54464ebe7853277e75f979c..06a2efa0b0242763053a5233fcc5cc1fb641b6c9 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: sxp-phosphorus
+    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: phosphorus
+    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-silicon
     jobs:
@@ -15,7 +42,7 @@
     stream: silicon
     project: "sxp"
     project-name: "sxp"
-    branch: "master"
+    branch: "stable/silicon"
 
     mvn-settings: "sxp-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
index c0b2d39c98178d229b3fb3fecaf277409339a9ec..f6f8c7ffabcb237a02bd8809f360cdcba63e370d 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index ff87b8d8134a096fb1aeea4bd1c4bfe7924c8a64..71f7217741871906b044f13e05f11df8f3720814 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: telemetry-phosphorus
+    jobs:
+      - "odl-maven-jobs"
+      - odl-maven-verify-jobs
+      - "{project-name}-integration-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: telemetry
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
+
+    stream: phosphorus
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "master"
+    mvn-settings: "telemetry-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[telemetry]"
+    archive-artifacts: ""
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
 - project:
     name: telemetry-silicon
     jobs:
@@ -14,7 +39,7 @@
     stream: silicon
     project: "telemetry"
     project-name: "telemetry"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "telemetry-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 78246b440d4ba4b769d150533a2bca2cb731f63f..68a950aa013f2024cb68e2f4971c1948c95e6a9e 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: transportpce-phosphorus
+    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: 140
+          build-node: centos7-builder-4c-16g
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: "transportpce"
+    project-name: "transportpce"
+    stream: phosphorus
+    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-silicon
     jobs:
@@ -16,7 +43,7 @@
     project: "transportpce"
     project-name: "transportpce"
     stream: silicon
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index ebbc588c8f3abb3d52f2324dd298d9ef4ae1c5d7..e6d3cd949800f2a1cad34af77d21a297aff681f3 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 982a932d915345d4cb8822df58e3deffb08b784e..b1fb21a92046792f35928847b3d8027f1ff7e3e0 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 160f68b0d2eec3d86d3c13d8dac890f13edbf816..4c7d127e91022c1a171d15714953d1094821a7d9 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 5fe72bee60c09a1b38bf84b23213b530811c415b..33d2f60ac77b779e28f638eb8fb4f6894c997fe5 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index c272649613222812e158d04d9278e9809ba3e907..cb45be8965d5b1869299b901841e87acdba56d07 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: tsdr-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "master"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[tsdr]"
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-silicon
     jobs:
@@ -13,7 +36,7 @@
     stream: silicon
     project: "tsdr"
     project-name: "tsdr"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "tsdr-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: ""

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index fdd45ceefb667f8b471e173a83b36e351d93fafe..dabac9d4c53dedaea066fbd71b07c07f22c06212 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,4 +1,33 @@
 ---
+- project:
+    name: unimgr-phosphorus
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: unimgr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
+          rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: >
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[unimgr] [odlparent] [yangtools] [controller] [mdsal]"
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-silicon
     jobs:
@@ -13,7 +42,7 @@
     stream: silicon
     project: "unimgr"
     project-name: "unimgr"
-    branch: "master"
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "unimgr-settings"
     mvn-opts: "-Xmx1024m"

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index e77b1baa46fc8cd035d8e030c7e7ccfe0e02c12a..b0fa5de3c604b018244ec0c58a90d1da120dbb8d 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7b3f549e58719ec428c0659ff13eae6fcb24cf65..116decf255569e1ca09528e89712ef5f42d68a9a 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: usc-phosphorus
+    jobs:
+      - "{project-name}-maven-javadoc-jobs"
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "usc"
+    project-name: "usc"
+    branch: "master"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
+    email-upstream: "[usc] [controller] [yangtools] [odlparent]"
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-silicon
     jobs:
@@ -9,7 +28,7 @@
     stream: silicon
     project: "usc"
     project-name: "usc"
-    branch: "master"
+    branch: "stable/silicon"
     mvn-settings: "usc-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 92148be94824382edebca296ca614dd84eb65c03..9905290fdbed88c5af80e232d8d003330701d35a 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,9 +12,12 @@
 
     # Project branches.
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index 469af901e35378b1072793b178d84d6e9e26667a..9957520e334bee9d588c20470a7e0a815f4ec56c 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,9 +7,12 @@
     project: "yangtools"
 
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"