Branch cut for stable/aluminium stream

Change-Id: I7f671d7ec40e322a06bdffb838c51d72bc8f5c4b
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index f4a417c623d60238f2de555082d94cd492bf7661..375a230f8c1e7e314ada3fff51d3f3dfb4fd5cc1 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index e13c590b9617b829563ec84883f8c43bb71040ba..53486d225cfd3d3af637323640a749a2d0015296 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: aaa-silicon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-aluminium
     jobs:
@@ -14,7 +39,7 @@
     stream: aluminium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/aluminium'
     java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index 9b838a189c02454a63ce82def2e1d1a033412611..a6b3c5a39df4abd320a25bc8f28ed375b04f66cb 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: alt-datastores-aluminium
+    name: alt-datastores-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'alt-datastores'
     project-name: 'alt-datastores'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: daa2b00117ed6
 
+- project:
+    name: alt-datastores-aluminium
+    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: aluminium
+    project: 'alt-datastores'
+    project-name: 'alt-datastores'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml
index 701f76ec3b2f9b47fbab568f7507e25e63063d95..dfc2124af672b66739acc0cfd721df1dc1cb3bd1 100644 (file)
--- a/jjb/ansible/ansible.yaml
+++ b/jjb/ansible/ansible.yaml
@@ -9,8 +9,10 @@
       - odl-maven-verify-jobs
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 5480703c15df5dabacd147879283cae377acf790..afb8f95631913bc5b61bb1692ab20fc198d79725 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: archetypes-silicon
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -8,7 +26,7 @@
     stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'master'
+    branch: 'stable/aluminium'
     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-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 88efcc96acc46c783ef8df39d9e32aee188c1677..29a773b3d6c46bb61e4b1167d1ff551f3d8744f6 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 244f96fcb45e13b69cd6d73c4296dfa170ea5a6b..17a5249c6eca6fc7495a05f699d3e7eee53cd411 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index ced3840dffc48d65d47c7cfdc39fd60d6184d93f..f54addec5a47825a8f4a1076c606abbaf747eda9 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 15d27ff9099aad19bb274bd84437bda3c9133127..31d825701b4382819ead80d802c1a5b0898e1331 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 2a9cad380a28568b0ebb7d23b79a542aa6ab3d85..404eb9848abfc93b2b7fd2a670701ab1f02fade0 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

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

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 6576c79a95473c28b52dfc3953f1e800be3307f7..de5e1fa7c0a16454ed76d63cd1cb60b2f343bd83 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index f452b88f97f09e74325324132b7b87354f2a8aa2..a2f3197fc38731f915965d7dbdea663c7b41498d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index fd8753ba357b7b37a4720d7a8b0ccb14c10befd2..211b5997915a2789129208bdf640ac69af4dae08 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 65ba2333994b9e5a8728ad3ff776d4774134e777..2b5773e3cd8cfc591c6aa26c4d6bf7cf4329c8c3 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: bgpcep-silicon
+    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: silicon
+    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-aluminium
     jobs:
@@ -17,7 +49,7 @@
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 6ed2d87b41e8f307550416eaaca7349242165df1..965b693630e51184cb2182c875f9d59f329aaa87 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 9a4f47ecc35b84365613c0b9c19c8df4513caf34..cfe9b4e342afa335e595345c3388b8fbeeb2e9eb 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: bier-aluminium
+    name: bier-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
@@ -21,6 +21,27 @@
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
+- project:
+    name: bier-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 25a1cf6117513e3d756b8e475a8cd4ef8aa6e509..37fc2fbd151eac3bcc1888d98662f5da391f962d 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coe-silicon
+    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: silicon
+    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-aluminium
     jobs:
@@ -13,7 +38,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: aluminium
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 c95eb3a53ee118a55cbc07cc6bbf885f780d408f..71769193b58aca77e4346ea88420dc9f57fe576b 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,9 +11,12 @@
     functionality: 'akka1'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 957775a9ef248b220451b98f82de1091f7e29ab9..9fb0e7d6b6fadb2aad54072800f35a6f4943f2a0 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,9 +12,12 @@
     elasticsearch-attribute: 'disabled'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 4d2aba33e2592e1789f4afdc934e5b6151a0146b..dc7dbbc5cf3386b9608c904c6a335bb748f3c8ee 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 726bc999533c0b20149bbbe8b34d980a0faa3dea..a2ffdf314bda8af99486c3e23eadc656bd93510b 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           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 e3470f6d4992a358be1d5b673d87f41001faacfb..c153a214afe61ec777c26583fa859c136af80781 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 8478e19fa6c827b8124637b629b0a00cb62a8e9b..fa781a2489aafe62fd8c1bf0edcfb276236df6c9 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 233f2b711479c349f6fc5189dc5c6d37695f85f2..08321c976557216c4ca7372e4883ae0d8196e77b 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 45d12958a2d7073ae3994013c4a327a61ec0ebe1..bebcd320605e18554c21d5bbd28bcb37ae1083a5 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index ddf01235fa317bf937c97d3e13c45fd56fb32fe3..6554f15083c2b28554ed85158283e14f659e0acb 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index 0fe0026ff47e361123b26c1fcfaf431d1e910ccd..bb3bc292af6075d7f1cd6afbfbbd41c945c473e8 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index ed408a31985d214ce86e0b8d04994c22fc89d6d2..1bd14cd1b43b70e7a5f8c22f87fc1b04ae653d5b 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           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 6078eed663788d6b81d715e7faa9d7ebf4517655..f97af95af4bde769468373e36f56f4a77123e8e2 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index 8e44441bed1e2c9b85a8f5ff25d5b2ced135b172..d443e919b751c31f69058e8ec6fffbe257033ac7 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'controller'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 1bab2dc6151228a85883a1f5b2471ccdd7033ced..577cd224f5670a5697bbe36dd8b8b023265889f7 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index 81e3800d708aa24ee12cc8c01e2e9d5d4bf35bde..eef4b47dc41f2b8f8ec95823143f2392f2992bc9 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 0f8758bee8675cee3c788d554b8913e343a6cc5d..a328195fc3d9fd5c545e79348fa94b6d844b8ee3 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -188,6 +188,16 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-mri-list-silicon: >
+        controller-csit-1node-akka1-all-silicon,
+        controller-csit-1node-benchmark-all-silicon,
+        controller-csit-1node-rest-cars-perf-all-silicon,
+        controller-csit-3node-benchmark-all-silicon,
+        controller-csit-3node-clustering-ask-all-silicon,
+        controller-csit-3node-clustering-tell-all-silicon,
+        controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
+        controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
+        yangtools-csit-1node-system-only-silicon
     csit-mri-list-aluminium: >
         controller-csit-1node-akka1-all-aluminium,
         controller-csit-1node-benchmark-all-aluminium,
@@ -202,6 +212,9 @@
         yangtools-csit-1node-system-only-magnesium
     csit-mri-list-sodium: >
         yangtools-csit-1node-system-only-sodium
+    csit-sanity-list-silicon: >
+        openflowplugin-csit-1node-sanity-only-silicon,
+        distribution-sanity-silicon
     csit-sanity-list-aluminium: >
         openflowplugin-csit-1node-sanity-only-aluminium,
         distribution-sanity-aluminium
@@ -211,6 +224,15 @@
     csit-sanity-list-sodium: >
         openflowplugin-csit-1node-sanity-only-sodium,
         distribution-sanity-sodium
+    csit-weekly-list-silicon: >
+        controller-csit-1node-notifications-longevity-only-silicon,
+        controller-csit-3node-drb-partnheal-longevity-only-silicon,
+        controller-csit-3node-drb-precedence-longevity-only-silicon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon,
+        bgpcep-csit-3node-bgpclustering-longevity-only-silicon,
+        distribution-deploy-silicon,
+        distribution-offline-silicon,
+        openflowplugin-csit-1node-longevity-only-silicon
     csit-weekly-list-aluminium: >
         controller-csit-1node-notifications-longevity-only-aluminium,
         controller-csit-3node-drb-partnheal-longevity-only-aluminium,

diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml
index 68d68e788610d1128047ace3690d9e50f2beb602..3ccc98e059484c86fda64d3b3efabb14e17206fe 100644 (file)
--- a/jjb/detnet/detnet.yaml
+++ b/jjb/detnet/detnet.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: detnet-aluminium
+    name: detnet-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'detnet'
     project-name: 'detnet'
     branch: 'master'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 8981976d0fea7
 
+- project:
+    name: detnet-aluminium
+    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: aluminium
+    project: 'detnet'
+    project-name: 'detnet'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index e4e898f7e31057c92f1bcde9d27915a0ca864ab2..ba6e33cb3f642f3a97bbcb3da439fff19e1debc6 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 5fe9eee1907b7ae0c9d4b3f3a7567006fb35b5ac..d956656529a0a02649db133b8a5c086d415b434d 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dluxapps-aluminium
+    name: dluxapps-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
@@ -8,7 +8,7 @@
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: aluminium
+    stream: silicon
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
@@ -20,6 +20,26 @@
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
+- project:
+    name: dluxapps-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: aluminium
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index fd9faf1b080f3f83146987edb0cd76096e98402c..f38dae0fdfa28553ccafb71f858a2fdc30ea390a 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 43ff1abc3c2091bf456b261965b9e6c69aa7ff7d..46bdaec6c5f85ed2500fb017261ad54b47cd8bcd 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 22019011bc9b410bbc18a276a28ab966f0e6bbfb..7cd7e09b557dfcb7f38b2ab5d26da3cd71a21a5b 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'genius'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 0a5084ddd2b37098b4cecc8c1f277afa45d33083..fef37c5d7599da06678a4ab59bfe78b8fbf6f713 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,4 +1,40 @@
 ---
+- project:
+    name: genius-silicon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{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
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -18,7 +54,7 @@
     stream: aluminium
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/aluminium'
     build-node: centos7-builder-2c-8g
     java-version: 'openjdk11'
     mvn-settings: 'genius-settings'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 5145980d964e4866db772ba86b8c93a7bb9f5ef1..13c242ea5c1079c502e40c53d0bfb4fd71bebe39 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -20,9 +20,12 @@
     functionality: 'openstack'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 65bf712809e7bb1c4a9940f37d3a5b32f8eb7cb1..d84f74ae8bff736d26f51779bafe11c66c343ef9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index eb92ba31ce804e8058b5043b5b5cdee4bf73e8ab..de96bd68535d45e35c812452343bd7c03b8df2b0 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 3371ae968ccd10593b99638e5406712118df4f1f..2738d89ba0c6880463c91cd3a1ec9bfd07ab4bec 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index c0fcd16314c58d93205abdad239898b86b23154d..0c9a9052e49bfadbb7cdbc3e17f0faef652745eb 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index c33f97ebf96a27260c6f851c8155e8ac4821b0c7..4dbf8ada171356375b2c3c1b566b2bd18b067bd9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: groupbasedpolicy-aluminium
+    name: groupbasedpolicy-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
+- project:
+    name: groupbasedpolicy-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index c185bf1267979e7de466dd7551aba3f6d4ca8b5d..638b1621d80666864550d0193260a8afcad44986 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'infrautils'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst
new file mode 100644 (file)
index 0000000..c2f3477
--- /dev/null
+++ b/jjb/integration/csit-jobs-silicon.lst
@@ -0,0 +1,63 @@
+aaa-csit-1node-authn-all-silicon,
+bgpcep-csit-1node-bgp-ingest-all-silicon,
+bgpcep-csit-1node-bgp-ingest-mixed-all-silicon,
+bgpcep-csit-1node-throughpcep-all-silicon,
+bgpcep-csit-1node-userfeatures-all-silicon,
+daexim-csit-1node-basic-only-silicon,
+daexim-csit-3node-clustering-basic-only-silicon,
+distribution-csit-1node-userfeatures-all-silicon,
+distribution-csit-managed-silicon,
+genius-csit-1node-upstream-only-silicon,
+genius-csit-3node-upstream-only-silicon,
+jsonrpc-csit-1node-basic-only-silicon,
+lispflowmapping-csit-1node-msmr-all-silicon,
+lispflowmapping-csit-3node-msmr-all-silicon,
+netconf-csit-1node-callhome-only-silicon,
+netconf-csit-1node-scale-max-devices-only-silicon,
+netconf-csit-1node-scale-only-silicon,
+netconf-csit-1node-userfeatures-all-silicon,
+netconf-csit-1node-userfeatures-rfc8040-all-silicon,
+netconf-csit-3node-clustering-only-silicon,
+netconf-csit-3node-clustering-scale-only-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+odltools-csit-1node-upstream-all-silicon,
+openflowplugin-csit-1node-cbench-only-silicon,
+openflowplugin-csit-1node-flow-services-all-silicon,
+openflowplugin-csit-1node-perf-bulkomatic-only-silicon,
+openflowplugin-csit-1node-perf-stats-collection-only-silicon,
+openflowplugin-csit-1node-scale-link-only-silicon,
+openflowplugin-csit-1node-scale-only-silicon,
+openflowplugin-csit-1node-scale-switch-only-silicon,
+openflowplugin-csit-3node-clustering-bulkomatic-only-silicon,
+openflowplugin-csit-3node-clustering-only-silicon,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-silicon,
+ovsdb-csit-1node-upstream-southbound-all-silicon,
+ovsdb-csit-3node-upstream-clustering-only-silicon,

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index e90c66301ef18f1b9c397b2139e41f38a0f540a7..9e7d9e6fcc91d7f218d9eab4bc37d39bc617a7ae 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 36dd6ba9bf6374aed929e787b5d19133340397db..b099fbea43983f1049900b253e89e0b4d670f96c 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,10 +21,14 @@
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: openjdk11
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: openjdk11
+          jre: 'openjdk11'
           karaf-version: odl
       - magnesium:
           branch: 'stable/magnesium'
@@ -64,7 +68,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
           jre: 'openjdk11'
@@ -81,6 +85,23 @@
               openflowplugin-maven-merge-{stream},
               ovsdb-maven-merge-{stream},
               serviceutils-maven-merge-{stream},
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'
@@ -140,12 +161,18 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d5fca6febd5b0be7de424c0e0c9f45a4feaa0fab..707b0a7ee9a204d8c1ab5a38cfc0b9eea3b78a9b 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           mvn-version: 'mvn35'
           java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-silicon.lst
+          build-order: >
+              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+              bgpcep integration/distribution
+
+      - aluminium:
+          branch: 'stable/aluminium'
+          mvn-version: 'mvn35'
+          java-version: 'openjdk11'
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
               odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
@@ -60,8 +70,24 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+          csit-blocklist: >
+              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+              gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              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-silicon.lst
+          csit-mri-list: '{csit-mri-list-silicon}'
+          csit-weekly-list: '{csit-weekly-list-silicon}'
+      - aluminium:
+          branch: 'stable/aluminium'
           csit-blocklist: >
               alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
               nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
@@ -117,10 +143,14 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-aluminium}'
+      - aluminium:
+          branch: 'stable/aluminium'
+          karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-aluminium}'
       - magnesium:
           branch: 'stable/magnesium'
           karaf-version: odl

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index a29ce98353cb961553713e43b0ccabeb8e0282a0..9a1b2a90ccf9d082d59a34487868df5e66f12aed 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 6bdd54d834f279b5f1641dc7568c8813fd3c36a3..6ad41ede1e7de0d473162a1c9651ccdd0f623463 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: jsonrpc-aluminium
+    name: jsonrpc-silicon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -14,7 +14,7 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: aluminium
+    stream: silicon
     java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
+- project:
+    name: jsonrpc-aluminium
+    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: aluminium
+    java-version: 'openjdk11'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index a2ccbb1052752237f8cc052415e440e5b0499a22..1c93e8befd15c73f043e55b182349466e15d3a46 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index a35111d361e1c54238514d74e081117d8f109f0c..115c182a7ad6765db32d0bb691580e11f6d4c49d 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 23ab9c4c2ecbe2967619a90e2f3b3b072d3d4c5d..78101db98fbc6e6d82378e52eb1a52d913207195 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 268b6223c36e5d4e3e77b31a9f5ec5200ef0ce04..6172f0defe2a5f63acbbc517c9cf2bf6d0a7687f 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -10,9 +10,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 16be7f055b3609c414b13c009163dced3ab0afd0..c2d851548371e450af9da1a471343de3dde74bf1 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: l2switch-aluminium
+    name: l2switch-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
@@ -24,6 +24,30 @@
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
+- project:
+    name: l2switch-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 3df1c63d25eefe9bdfdbb7670bc8353acc2d822a..98f5676837a709c7d289e8c3d331013238473a94 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 82ae84fdb68a0309deff45da4748058c19ad4a7a..dfb3aca6b66477c742b05e6d701f042ff2ffb31f 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: lispflowmapping-silicon
+    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: silicon
+    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-aluminium
     jobs:
@@ -15,7 +47,7 @@
     stream: aluminium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 d34691fc6a425da4d544f67a83b60ba3fe92d2aa..26df6112f74d4817c1cca7897cfa8eeecd908d6d 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
     functionality: 'bindingv1'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 57fc332f2bf588c921c135f49f73baaf8b12c5aa..02ad831068e92d1d3ac5406a77d01100023619b9 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'mdsal'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index b68471a95a58eb7f6a1316cedb40d3360150908c..382b9d427c98308d289a78081454cf0128eec831 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 6e19ad099a180359e542b570b9747f389932f992..fe2d96d3d78875c1c0ac2924f0f7113300665fe2 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: nemo-aluminium
+    name: nemo-silicon
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: aluminium
+    stream: silicon
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
+- project:
+    name: nemo-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 7c54ff96db71cf728366773d230d0309c84a232f..66126e65ecce5768d0c1e549d901763db5bf4285 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index f55ef62a4c626cd4e2001b5a7bd174095bfdcfdc..a4c2f7e809acff53de13968631f5e3ed37d20d66 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 0e0352f2e30f92dd054a54abbb45ad822070bca8..abe038662a39d751d21d457daabcdb0b30ac5f5b 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index 14cff7d78c41de2e90c47e39666a51f6f8d43d23..b015ade27df87cccdcb2cc1be1a719326bc6b476 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'netconf'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 3c3b69af81993da5750b0c22888bdf041706312a..da64790362e68d6fb76c10ca78f24377280e454a 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index bc82b82130eadfd618ab410b6b3a01385175aa88..93457d0b21dc5beac901bc6aa80cc84ba6f58afd 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -18,9 +18,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 5a79625e235e89ca5b825e7ca450f54377e73317..c456cb6640dfe4a96e3716aa3f24aed1071fdb5c 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: netconf-silicon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: netconf
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
+          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    build-timeout: 90
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-aluminium
     jobs:
@@ -14,7 +42,7 @@
     stream: aluminium
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/aluminium'
     build-node: centos7-builder-2c-8g
     java-version: 'openjdk11'
     mvn-settings: 'netconf-settings'

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 075701fae38a34104364bd6946091ed2e5e28b20..3069a4da09f4d956e76324a2dd798bb583fbc0b7 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -8,9 +8,12 @@
 
     project: 'netvirt'
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 50499ed92b57b9f7622f7e348cd7b54723da3a09..78bcead95440b0d789ad0b138316d08af58fe7a6 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'netvirt'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index c132094708e9dffd9981dac42e178f83434e50cf..11ee0f7c2bbb84421e7a68a6ce41fc3153db8259 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,4 +1,44 @@
 ---
+- project:
+    name: netvirt-silicon
+    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: 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
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -18,7 +58,7 @@
     block_on_csit: false
 
     stream: aluminium
-    branch: 'master'
+    branch: 'stable/aluminium'
 
     project: 'netvirt'
     project-name: 'netvirt'

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index 18180a94a277cc117fd7e882f22e85a0c4a152fc..c0512be767a1dc733331092473665cc241ee9dab 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -7,8 +7,10 @@
     project: 'neutron'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index e64a81554a8888eff4c49dbfc167714400baf483..b6d3dc8384859b4dc5747b9823854674aa56a8d8 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: neutron-silicon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -11,7 +33,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
+    branch: 'stable/aluminium'
     java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
index 795a2ee10dd50cd1e47fca11be37916884e41f41..0764fe445f6e6d88f69c26d0df97aa6dc11a7d5d 100644 (file)
--- a/jjb/odlguice/odlguice.yaml
+++ b/jjb/odlguice/odlguice.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: odlguice-aluminium
+    name: odlguice-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'odlguice'
     project-name: 'odlguice'
     build-node: centos7-builder-2c-2g
@@ -20,6 +20,26 @@
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e
 
+- project:
+    name: odlguice-aluminium
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'odlguice'
+    project-name: 'odlguice'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'stable/aluminium'
+    java-version: 'openjdk11'
+    mvn-settings: 'odlguice-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
+
+    # Used by the release job
+    staging-profile-id: 44ce7d1aad49e
+
 - project:
     name: odlguice-info
     jobs:

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index cd3d3f8c640f738170bf4f86565bc3f59b5b2e33..a7dcc8d423c07255da3c4c6a8a7bd4081b8485bc 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: odlmicro-aluminium
+    name: odlmicro-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: odlmicro
     project-name: 'odlmicro'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
+- project:
+    name: odlmicro-aluminium
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: odlmicro
+    project-name: 'odlmicro'
+    branch: 'stable/aluminium'
+    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-info
     jobs:

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index 0141f7801b8f4500e37a15e3d69cb9f601d69a22..d5e40bee2f133a7d5af7e14f867db2929a7872d1 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,8 +7,10 @@
     project: 'odlparent'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index eea06da079c8808e0a91c5b48cc728c715e1dfca..e03ad84038fb1bd62d8929d8dd5409a5310cc711 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: odlsaf-aluminium
+    name: odlsaf-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'odlsaf'
     project-name: 'odlsaf'
     build-node: centos7-builder-2c-2g
@@ -20,6 +20,26 @@
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
+- project:
+    name: odlsaf-aluminium
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'odlsaf'
+    project-name: 'odlsaf'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'stable/aluminium'
+    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-info
     jobs:

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index a84a280e6bf02f644604d9a87dfcbf27cd959f7a..ae939f582a485aa561603b7e99786e3ec26ca343 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -10,9 +10,12 @@
     testplan: '{project}-basic.txt'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index c3503a955b78a5638976c41c2c0961eced1e7bd3..a7feb59969f4c7b83addea87ebd696e6f128c174 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
index 2a9b7e9e686982e357f3b7350c6f623883dad089..b56e22d75737f934321d024c652d079eb78ab101 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -12,8 +12,10 @@
           rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 33d38c7ea2bcbc4406c73903511e9df32744e15d..de61c43c9df65199c804f6a70db9154097f17e5b 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: of-config-aluminium
+    name: of-config-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a6880455efe67
 
+- project:
+    name: of-config-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 78ea0e48411b6c9eb9be8ea86115d06cb2d76bd0..c271130d901fc43b2ec91c45d9745559845ef2df 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 8b561ce744ec86580b1bf4e07248973c9633e4d3..cd25e53e1d7875e1ea98bcb8c6552a6b9af243fd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 0402ba372e98e89d8bcee8740662ef231d786775..fc05d507778e79049b5c7f9ede57390d23e5d893 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 25dec7c05108477d72eccb436f6f7e4d01065ede..fe9523583c485fd91da9d7593ab3d3d0181eedaa 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 77c16256821631810f4a61cfbd80f9a2ad55dd61..219b574053e9d255071ea6c64249637e3469ba88 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index e30af69f468483ae4812a7abd5889906169f35ee..926c68c03991d9b1928e2715b623df6968320638 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
           install: 'all'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
+          install: 'all'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 5b2cb7e5d1e29b641166936da61200979ad7cd1a..4a812b25e98c76f099f8df253eeaa46dd457780a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -16,9 +16,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 7c344d5fea8880090c0cdf638f6e9e419497fe31..5ce4c53197dc026fe8331223aa3ee8db730f0676 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 84262cb005f2fcf0119888978865f570f52895ce..5b4ee0390bc168a17b48f2160a3f8076747da47b 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index d814d36c33b2deb0756d635cb181923a66624f5b..cd47ff9f5c16e226f33b5bf19d95bbd0f69a1213 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index ad11f1526ae303b672d731ca0231a23a0506d88a..7bce1be24f6504ba557a6a4b7a632cbb6c868414 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index ef5e744ff969cd3a3c5ffc33daff786f0caf6dd9..5f30702886cfe73a3469ecdb690b535f8dfd45ca 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 066510af2a5cb0f3354fbee0d10f9c4687dbd7d4..8ad83c447040473c83b9aeb2d129a1a0a7734135 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index d5d2ecac1368bd786104124657f61138c33c7de8..9b4ddce74511c547323954791447b3485028eef9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index afd677a1c3b38d7a0a782aee946e78c93eb34ec6..f09216bf9ca7260cb2e1315a130ae43163ba65a6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,41 @@
 ---
+- project:
+    name: openflowplugin-silicon
+    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
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -19,7 +56,7 @@
     stream: aluminium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 3d6531ae56ca555bb232f594faf3cc79f6aff8df..8334a7a24972c99c66654d73a48ba8cc414060df 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,11 +6,16 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
+      - aluminium:
+          branch: 'stable/aluminium'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
       - magnesium:
           branch: 'stable/magnesium'
           libuv-version: '1.20.2'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index d273f3953d41c43b9442427cceff58b6f2d5fe18..47c1cae38714698e5ee3d1878f33924fda255fa7 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -10,11 +10,16 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
+      - aluminium:
+          branch: 'stable/aluminium'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
       - magnesium:
           branch: 'stable/magnesium'
           libuv-version: '1.20.2'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 046a98406d51c559ea8c7d972503b1021f7bbff0..7c9348a6812a86c323380f4941497a179ba43d29 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 22e0e8ae8fb3d899106eefd35ccd7b4a1cd675d3..2ffcb9a0738a512309882daf31f8215d2718e98c 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index dc40a19352bad0033f4bde0c7e65f277903354e9..cc641eda9b3d5a59cd830dd6a6fa3213e4f405ba 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index c52b34d364d52530c64e728aa6b694bfadbeed8b..eb487d560262064f9f2a71709eae8d8fdd0c3416 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,9 +8,12 @@
     project: 'ovsdb'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index af2ec28f0f198968a32101e1a1a6a0e5a739a593..02f8c80178c4d8ebc141d6d97a5fd8ba18af36a7 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,34 @@
 ---
+- project:
+    name: ovsdb-silicon
+    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
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: silicon
+    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-aluminium
     jobs:
@@ -18,7 +48,7 @@
     stream: aluminium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 ae8f46da7af418168f19c3ce83c280177a27dd73..829a7caf0435606f4e638d3349552b16a6f473ac 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: p4plugin-aluminium
+    name: p4plugin-silicon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
+- project:
+    name: p4plugin-aluminium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'stable/aluminium'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-magnesium
     jobs:

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index dd794b7fdddc6876e20d67eb9e9e23856080e915..f6e9aee3bd553f94be9c8a6d20d15b9520c37f35 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -15,9 +15,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 5d9f5fabc1760e312c739dc3e149753d102501bf..1425f73b3bedb6aec1b11f51b84080b92bcb3ec6 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: packetcable-aluminium
+    name: packetcable-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
+- project:
+    name: packetcable-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index 2397c85dfe2ba9cf89b1c6a7c1100d9506fafa0a..bf8efaf164aacaf38974209aa450f7f603cb8258 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -7,8 +7,10 @@
     project: 'serviceutils'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 0a9cbf91d7e82cff9fc45805bdc274cfae1f8858..4c9d5db13e47417ff3070ad266166a7cf62fd657 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-aluminium
+    name: serviceutils-silicon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -13,6 +13,39 @@
       - odl-maven-verify-jobs
 
     branch: 'master'
+    stream: silicon
+
+    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-aluminium
+    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/aluminium'
     stream: aluminium
 
     project: 'serviceutils'

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 5bbfbdcba30c204d1692200853be404e910cb94f..8b01c9b1440b3d6554f8bee1387a534fe95cf887 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 80d389143b674c00bd9b8409e2c05de99a4aa40d..09f98271946d93fa1b874b6d8a64254f62c2fc11 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index 42f334eb608a9ec77d76ab76b0e2cbffbaa7b1ff..1d7ef2c943dc68f3160302d11daa549d1428f82b 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index bd0daa5a1763c823605cfdf5aca8c459363bc14c..9afaad5ff1fce89c9e61aba72b284387fbfd1dff 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -5,8 +5,10 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
+      - aluminium:
+          branch: 'stable/aluminium'
       - magnesium:
           branch: 'stable/magnesium'
       - sodium:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 2e46db2a40acf44527a10a92c5edb610362c3523..9be59825c8490f9a98d2515a73be46febdf5b80f 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sfc-silicon
+    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: silicon
+    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-aluminium
     jobs:
@@ -13,7 +39,7 @@
     stream: aluminium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/aluminium'
     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 7193d27c3a3eac3652212b700b97b25cf59a568e..9061d10feaa2b8e52c915936ac0985366af2b8c8 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: snmp-aluminium
+    name: snmp-silicon
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
@@ -18,6 +18,24 @@
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
+- project:
+    name: snmp-aluminium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 9ad5b64de1936b02b1bfb88ebaab9f91d16d587c..fdfb44a895a256bf73399cebf7572ba1edeb4807 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: snmp4sdn-aluminium
+    name: snmp4sdn-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: aluminium
+    stream: silicon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
@@ -23,6 +23,29 @@
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
+- project:
+    name: snmp4sdn-aluminium
+    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: aluminium
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 28b1270e3797d6638c57b1c12ae7b649dcccaa60..b32a4547ab45a2090548fd411d255455beae255b 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index d6c9a4ff3204087d93b84fbe10f379f0a60eab41..f83cbc2081982f75ced6aa28ba626ee9e386e488 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 52d70be1913fc2c0b7aca19e091b0e6d6e038845..7d29eddd3718f35a27b715e1fcdd4bc079dad146 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:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 7fc430817878b15e3df0d9f61126bc4f25a01af9..e1f013fa5cfb4c5bd858faf357174c26ea4d4897 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index a83f648eef70fcea5bb1cce8378cd2223a22939d..a71eab0c11d28ac90bd8faabd50e829fca9331f7 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 4af044b963a1af4c5143eae5e371a2390ac8e72e..03690909029eea6db2050bf5e24785c36a6de3ac 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 443585b0c686b8b0d37229331c7de6f51404c36d..9951cb619ebfe689b085a2b7dabe854b0724bca0 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index ba2b58e15e5e64f202ecea7707a09b9d3db2666c..6551f89ab3f413a3a43c228c58edc4cbecfb8a97 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-aluminium
+    name: sxp-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -13,7 +13,7 @@
 
     java-version: 'openjdk11'
 
-    stream: aluminium
+    stream: silicon
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
+- project:
+    name: sxp-aluminium
+    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: aluminium
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'stable/aluminium'
+
+    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-magnesium
     jobs:

diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
index af637e1d68781bbe34a3314c922df75d6e6f7cfd..1a02333063fb72fb6ab03873e931c4ace8baefdc 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 00533d7f8d00063d22a45de85ff52deb7a873270..5405f9b86123d3c07ee05f24994d8c3e85cf9a9e 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: telemetry-aluminium
+    name: telemetry-silicon
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -12,7 +12,7 @@
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
       - gerrit-release-merge
 
-    stream: aluminium
+    stream: silicon
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'master'
@@ -25,6 +25,31 @@
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
+- project:
+    name: telemetry-aluminium
+    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: aluminium
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index ec52b9fafe9589b546d03267f8ae93b4edddf620..c9bbf54bc732140ac4adb9638baa3dd171ab2785 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: transportpce-aluminium
+    name: transportpce-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -16,7 +16,7 @@
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: aluminium
+    stream: silicon
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
+- project:
+    name: transportpce-aluminium
+    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: 120
+          build-node: centos7-builder-4c-16g
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: aluminium
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

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

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 6e4de655e9b3eb0759b3db0456cb38e22a16dbeb..88bb35d488cacaa46238c2d0443dfde6ce284781 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index d7b38c30b96f9cb7ceab6c3056b46956333c18d1..2f3d5578356066c37ea9d138e55437b856c76c3a 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index a58b1ba6b9e9351f1392f2d95bcdd9d630cb42bb..dd606fafcf4d9074017d2fb365d8e72e84eaa6e4 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 7d44c4ea5ea5581433c0bce5d56bda1011651e5b..82391f9197d98ee284fae9c52a7417d1c4358e1f 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: tsdr-aluminium
+    name: tsdr-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -23,6 +23,29 @@
     # Used by the release job
     staging-profile-id: a69373036303c
 
+- project:
+    name: tsdr-aluminium
+    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: aluminium
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'stable/aluminium'
+    mvn-settings: 'tsdr-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-magnesium
     jobs:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 1c3d3507780cb10ed351f22b5ef8cef2a9895f4f..2fccbd4cfd516178241980aebb2bdb95884673fd 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: unimgr-aluminium
+    name: unimgr-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
@@ -29,6 +29,35 @@
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
+- project:
+    name: unimgr-aluminium
+    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: aluminium
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 2f2b42e46b2ac54fa667b50d431da323b869b825..7ca1cbfc59bcda37cfd9826f47324c594034c883 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 9a93d7571a1bb7f00ba399506cd9ddd5f287c391..7a344f3a064367ae23038694a7f651893afb7b2f 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: usc-aluminium
+    name: usc-silicon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
@@ -19,6 +19,25 @@
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
+- project:
+    name: usc-aluminium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'stable/aluminium'
+    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-magnesium
     jobs:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 202c028d83d43c75ec3a45de6e58458c9dca6660..b8a8061a068176e36c50474de784f9f6aa7290e9 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -12,9 +12,12 @@
 
     # Project branches.
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index a9808ef6901e7805079571bb72d4ad36d35a176f..43718d58bfe614597c79d7ce8643742ad6bb8510 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'yangtools'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'