Nitrogen branch cutting

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

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index fd55fdb28661b60314187014090aaca462ffb61b..807c912400b707fd9f94b46b68af1589f29bf8e4 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 2da87cf88bf0c44ce7e4f4f65c4ab5cb203a8d42..347af910c891c1c2dafa8c25dbcf5dfd87bba2b4 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index cf1bfc1c6486a7b3ebb46778e20499fa604a517f..80722ca46056c56e32cba8e9334050d85d355d22 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 11423ffd268af1ec761d465658637a61833d51aa..5485dfd9409a0e18feb6a864bc51462682e6c15d 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index e4547aff135af0b8a825d731790d5411bc37dcf9..c8850a361f83bf06fdb8406a747a61d517fb852a 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
 
     feature:
       - authn:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 42787db265f4f232ac917b6645e2f2868735e410..feb3cb91585d0831ce679a5c876cecde0c8c99c2 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: aaa-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'aaa-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: aaa-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index de3886864d1fe0038c985f8f6cce83f8648d72f0..a1c337240a7dfc99e5420447202e3abd11781e3b 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index e9fe7bb41ce6ebe3dfe446d43d3e8923fb9e8ddf..ba01d1516b1eecc2cf3b87d57b879cfd22ca174a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: alto-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'alto-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
+    archive-artifacts: ''
+
 - project:
     name: alto-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'alto'
     project-name: 'alto'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index bf9e326ef18e1031c290a501528598bca98c21ac..638b914caeb0b460c8bf3107085b2bb93b4771b2 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 1f72008266f38afca18021451d3d59162711363e..e40122df4c2f9e28ac909c485462893cd2ed8f93 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: armoury-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: ''
+    email-upstream: '[armoury]'
+    archive-artifacts: ''
+
 - project:
     name: armoury-carbon
     jobs:
@@ -10,7 +36,7 @@
     stream: carbon
     project: 'armoury'
     project-name: 'armoury'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk7

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 04e31cf99b32ceed84e64f7e3b5a0abc1379a20e..452f71d4d2ae89080b27cfae7834fb49a385662a 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: atrium-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'atrium-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[atrium]'
+    archive-artifacts: ''
+
 - project:
     name: atrium-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c777c8428d53abf60888355f67eb5ffd3e91e871..fee1e77dfc093c86081ef7c10dbc7c4637041d67 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,9 +5,14 @@
       - 'autorelease-release-{stream}'
 
     stream:
+      - nitrogen:
+          next-release-tag: Nitrogen
+          branch: 'master'
+          jdk: 'openjdk8'
+          integration-test: nitrogen
       - carbon:
           next-release-tag: Carbon
-          branch: 'master'
+          branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon
       - boron:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index e39426af19abc9fa89ec1a58787f6ec4a1bcfa93..b6b3af9a2fdff1ce98e6b6a025b9676c725c16a5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index a65c61db2f69894f5a29e5d4c82a5dad605fdab2..90824d9cb337458b25f4a9b68dcc3ba8b1be90e5 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:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 0e6aeaca86cf54524c803b73de147fad68787f04..646e7d754ccd15f1a61173bce8b26b187afed0c5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 81961b4c4fa92974372d51a35d5c03b23880770f..fe238d1e24b78f027879b1dcd2d813275330f565 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 876e4981eb226f1caa8c767e8a87880380c1001c..38e2ba0a90565f6b81b6862c38566961d651fc7e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 03130a80b0842a3bed4ef40b9647cb4a88e904c8..dcd0281e9eceb9725d783537a5d035f38d19a1f3 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: bgpcep-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-java-builder-4c-8g
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bgpcep-settings'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream},
+        tcpmd5-merge-{stream}
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+    archive-artifacts: ''
+
 - project:
     name: bgpcep-carbon
     jobs:
@@ -13,7 +46,7 @@
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 8c620cee2a17b6c2bdb2708318876866e3bc4ec0..6fb0a417b7ed3276925a4fc6f35d6035d2a8bb32 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 \r
     # TODO: Delete the following if suites are compatible with Boron again.\r
     verify-stream: 'carbon'\r

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 50d83c9d9490db91b7f534adba48fde3f5f67e2e..6ec561ddc1feb341e1bbf69c06231cc022e3495f 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index c9b3f09039b09be9c9f92e07d4d3b078315b5518..f6188adea7be9624d2e04bd447e00cef657f5fe3 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: capwap-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'capwap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[capwap]'
+    archive-artifacts: ''
+
 - project:
     name: capwap-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 58b08a2149baa1fac2c223f9c6a14b14af83353d..34b2e7e7dadc0c4b3ac656debee6e3643f2f6760 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: cardinal-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'cardinal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+    archive-artifacts: ''
+
 - project:
     name: cardinal-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index eaa5de453539306d4ba169f0ec44008007d86df1..8b965dc8d9e48759c4acb046e224a6fbb2b677ed 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index fac8ade2e2ac2ad48a73e769322e25635837cc70..373361eb0f204fc976244bdb5c739dadd9307636 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: centinel-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'centinel-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[centinel]'
+    archive-artifacts: ''
+
 - project:
     name: centinel-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'centinel'
     project-name: 'centinel'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 2686865d95f2467187a6af416bf8de69672ea6d3..c5f74a2ba1f23635060e2d97ad18cc7f39b7a2be 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coe-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'coe-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: coe-carbon
     jobs:
@@ -10,7 +35,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 9708367766dbbf6a8fa1acb93b43a2f26dd1eb6d..9be47634b114f2645751bb94c7cbab3022662485 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -12,9 +12,12 @@
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index ee70dbfe4e297c06429e8858350e197dc897ec59..9bbdf02bfc4bdbe7a5d5ba355dbf00ff8e42ab58 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 721966c0535b3d3497b24df5df67b1b909e5ef66..004b8e7e29cfcdcefce68811895e89ced2827e33 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 44adcb92ea765117c00c90a758792ef7fe05af5d..3b72db1e1d964325ea159a2021b24e4a3a660730 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 608a50c39ae17ab53048381df501e92ed025e4f8..6968fd9f366452a8e32a86370fb5ca03a2529403 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index a1fa0f355d491c9227e5dd97cf75f6cc648eaccb..0f3dba3867a37ec420a35cac51f8d85b9d813a45 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 8ab95ce935d8e14b19dad9312ec399679b3f1ef5..0e46ca42a24b6602ce2aed84efbd183a837b2408 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 6ca973443e56557dd6c6d0eaef073fc09e03b825..a31451ce17f895a9227be54e907a1c092df07d48 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:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 0537ec216c100d616bad569b96687ebf0abe71c9..c3dd221adbfdeb7f5ffc4b892416c7d2bae6d141 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index cfb0d9081cb3857fff4709c3fed6af9c03668916..dbb2dddbcb7273924ff42117b2bc86d9cf9b5ee7 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: controller-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: controller-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 6f3cc1e15f63ae959211c29318f108273228d085..09860abbf8910e09248db122d06df855ceecf3ce 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coretutorials-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'coretutorials-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    archive-artifacts: ''
+
 - project:
     name: coretutorials-carbon
     jobs:
@@ -10,7 +35,7 @@
     stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 1c4586b27d70eabe5efaf2ec3fd7f891018ba5c9..cdc5d5a93644916131ce904a5d31a42d9ff80b72 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
 

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 0cd2f6de3aab0c5109a421e4a3abdb527e245ac3..eead0a4fdf35635c4397980b8ee16dd855ae3c00 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: daexim-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'daexim-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: daexim-carbon
     jobs:
@@ -10,7 +35,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index bd528f52b87e9cf8c3a74921ab7c7047808e0598..f585f48e39144933c428e5a0f4016024fe8ef2b0 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index e0eb6405543fd4954427192e49869d0987cbd2ee..6efc1c58b88e5cdce75b05bde329f2bb6da6cec9 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: didm-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'didm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[didm]'
+    archive-artifacts: ''
+
 - project:
     name: didm-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'didm'
     project-name: 'didm'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e8b145559f4f3f572dfe5fc7dcc5811a9a0c73cc..a7e83e8f11c741a20530f661bf3f32382b56576f 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: discovery-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'discovery'
+    project-name: 'discovery'
+    branch: 'master'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'discovery-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[discovery]'
+    archive-artifacts: ''
+
 - project:
     name: discovery-carbon
     jobs:
@@ -10,7 +35,7 @@
     stream: carbon
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk7
     jdks:
       - openjdk7

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 38077fd7e125498698045ea6e6863f372b7ff2d7..976feec36445043b104601eb3c77c96b93da7ac4 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: dlux-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'dlux-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: dlux-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index afa1ef03f1d60e5673921120edb597bef992c9a2..6dc55f32d68778353f51784cc11e756d7a31a817 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: dluxapps-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'dluxapps-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: dluxapps-carbon
     jobs:
@@ -12,7 +39,7 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 2aef3457a49ea983d8b3f3e3ea911acf43f18ee7..f06c034e9c43d12eba1356e71ef56aa7e66d7219 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -7,8 +7,11 @@
       - '{project-name}-verify-tox-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
       - beryllium:

diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
index 76a0ffa06bb8f58b252bf01110f71eb226c1cabc..267503c9d70d92a5968e3459904e1d9fe91e83d5 100644 (file)
--- a/jjb/eman/eman-csit-model.yaml
+++ b/jjb/eman/eman-csit-model.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 4b889806f3f4cf785d8db8bc80d4415051eedb33..b6bfbf34836741e9a2fb8d98cdf28cf04e784e64 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: eman-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'eman-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[eman]'
+    archive-artifacts: ''
+
 - project:
     name: eman-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'eman'
     project-name: 'eman'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index ff630de93e7bd03779eec8e4f2f55e7d594fd7c2..39af4df881d67cdd66bd446267925fd185fe6414 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: faas-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'faas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+    archive-artifacts: ''
+
 - project:
     name: faas-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'faas'
     project-name: 'faas'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index e79069554b0e8716bc34205b774500c761058444..a1ec96b8bf569a5b1f116134bcde8c388e008378 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: federation-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'federation-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: federation-carbon
     jobs:
@@ -12,7 +39,7 @@
     project: 'federation'
     project-name: 'federation'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 75afd356c80be13931d1d5d4ae87d7beacb05077..084f7b1bce64666ea3bfecfd7b6b0ffb4c1df27d 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 243abe5ed33242770c85b90e40f14d6496bef2f6..6cf71d1397912139fa69b67b3de9563272d43306 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 816e81ace0ede074f14d3c440f09e4419cc13af0..9fa00f16ed98d255dd7da73cde879b38a6066f41 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: genius-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'genius-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream}
+    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
 - project:
     name: genius-carbon
     jobs:
@@ -12,7 +44,7 @@
     stream: carbon
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 7c7913813501d559dcd41ee59da1f8d0c3bbaa66..e38eabadc5fee84b9d4d7651c095192b41177b58 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -19,10 +19,14 @@
     functionality: 'openstack'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index e611d0fd71787abf2851839383f0e61531d417c9..8c5c5e798d87c87cd4be299b5ff5fae61e479b44 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index f54fbb8f7d2e2afb9c5d12aaf6454ea97259fc08..e7009e39041c31a819e3a45c1bcfb3809ecd47cc 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 6b386c0fc6594b1fbb0bf7ec09953d2f827e4024..f575d645671ab1ad99cb978a287a980b13df6eea 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 970722602f7ad7f710f3662b0b9254b2bbb8ef61..a4b6bdfefdd2bd2539d3000ac357060f9e1529b2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index b0c69d6223b01885cbdb94092e3c4d9e477a2cc5..f09f9998bbec22b0896119cebdbaac46ea85bb5b 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: groupbasedpolicy-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    archive-artifacts: ''
+
 - project:
     name: groupbasedpolicy-carbon
     jobs:
@@ -12,7 +44,7 @@
     stream: carbon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 50a1b379724607e8ce6ad842402a5d391faaddca..2b0d709ce4d6bd37a6eb11d524b4bb690d2c93eb 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: vbd-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+    archive-artifacts: ''
+
 - project:
     name: vbd-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 09fbf197b5747a37ca0a73fff4fb2059d3c09309..575a9fa6ac5168752e1f1dfdf1ecf99d8c97dc76 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: infrautils-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'infrautils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: infrautils-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
index ef584dc92e75b09dc8cc1e2e5d4cf0bb4576f8eb..4a62e56b995d94310c82ce6d7d115faf47c6ca92 100644 (file)
--- a/jjb/integration/distribution-jobs.yaml
+++ b/jjb/integration/distribution-jobs.yaml
@@ -12,9 +12,12 @@
     project-name: distribution
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index a6dcd2efd0161a42916a466b16e3f6f1e396d033..f2e5f6b494ce7b2c8ddb47a01a1ecb8e5b273837 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:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index ec32f448579ab64d1c6ae2235f2142dec031d3cd..b9ff74d8af2246c9edc2dfb3213e5b15154e2231 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -9,8 +9,11 @@
       - distribution-check-{stream}
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
           jdk: openjdk8
           jdks:
             - openjdk8

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 359bd3f7981af55de97c5530f771cfd2f712ef13..e8e396fa82b03b40b51b7ec41606e1fd19288def 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,8 +15,15 @@
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+          csit-list: '{csit-list-nitrogen}'
+          csit-sanity-list: '{csit-sanity-list-nitrogen}'
+          csit-weekly-list: '{csit-weekly-list-nitrogen}'
+          schedule-weekly: 'H 12 * * 0'
+      - carbon:
+          branch: 'stable/carbon'
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index e32fc648e0730cc9092bc4b1b5fda7a47bc6b1ba..42cd514714820c48133c9bd58dad7564c69c5159 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -17,9 +17,12 @@
       # backward incompatible changes in test suites for Carbon
       # TODO: Create test suites for specific release before
       # Carbon if needed.
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     # TODO: Delete the following if suites are compatible with Boron again.
     verify-stream: 'carbon'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 65488ba159c9a7b12cd285f733ae85c35af9a75b..44231502d65000c23cea55bf6849c0cac5b338c4 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: iotdm-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'iotdm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: iotdm-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 13bfff1e1ce6e495bc454dbbacfd6c7d7f95ec13..ef9192d955f7bf6fb5d148038bd6b13247757eda 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: jsonrpc-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    archive-artifacts: ''
+
 - project:
     name: jsonrpc-carbon
     jobs:
@@ -9,7 +33,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 8b53e5536414f154d5b69532aec15402c0f7e4f2..db65a17e31345b09537f817100f2232224ed0b0f 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 431bb7090ad871c53da09af6c47123857e7a5553..76ecbbb717735d3dc18311e86246113381c335fa 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 0b752da35080d06b89f580b7e3f6a3c2a820f827..be2d089e924293a40bcee158ea49a1ad9a83772d 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 52de3b90d0d4b6423f43f09cbafc8f993fb90261..24dfe9c7a2337b82af77beaf1fe3994e74c04420 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 22ab3dab821d594c13e3fd6e3022a6c45b50c9e7..4b75a36655dcf5320e38ccc313e80a3e48ff00a4 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: l2switch-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'l2switch-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -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]'
+    archive-artifacts: ''
+
 - project:
     name: l2switch-carbon
     jobs:
@@ -12,7 +44,7 @@
     stream: carbon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index dbe97f6e8f67f0b8d6d87bfd271295f42aacf89a..5d184f2028000a2f75abcf0422dac60cf02c3615 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 7b13db3aee17d667d80f7f0461679f0f127a62d3..a9acc22d327a7eefe9042ad33e28ab77a168bcc9 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: lacp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    mvn-settings: 'lacp-settings'
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: lacp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 1d2d829d79906dce1e4493caa725ad0130f2135f..45e6dd36e3886faa7de4d1fb68d0fa72115bcda8 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 54f832ec3a2c08405fd0c61cd8c74e12333901dc..aab9b0f666651068aeb3f2bcbefd39668a9c00d7 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index ffc89f9119be73f431919a296b6149941b623e16..dd9b65b93ebbc2f26ed3f97064d3134bd07c1cad 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: lispflowmapping-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -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: ''
+    build-node: centos7-java-builder-4c-8g
+
 - project:
     name: lispflowmapping-carbon
     jobs:
@@ -12,7 +40,7 @@
     stream: carbon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 6c6769295af854f5b307f81225053cc5f22f4e05..c91af50441823c56b5b86c4adf53f1052377fd5d 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -12,9 +12,12 @@
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
       - boron:
           branch: 'stable/boron'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 2b4c0c381a9e0ebad1d11dd6a3cc167d60891bcb..088b60cc88e89060376062f105d75129a23feaa2 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: mdsal-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'mdsal'
+    project-name: 'mdsal'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'mdsal-settings'
+    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: mdsal-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index 59a6952e974ef671e9a0080aac9a0a29274e8b0e..f40f634b3a89b46178c9a3172096c5ff1ed3fdc1 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 98809b68e515b7775961e76e4fda202a2a97c440..1aacfab228f072ef9e5ac6a07e9a3f268cccd40f 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: messaging4transport-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'messaging4transport'
+    project-name: 'messaging4transport'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'messaging4transport-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[messaging4transport]'
+    archive-artifacts: ''
+
 - project:
     name: messaging4transport-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'messaging4transport'
     project-name: 'messaging4transport'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
index 9a3c23f4660492b09923f53564ac1e6fd9f79d59..e1e7b27e46453036cca7bb185b50c13b63cfefc7 100644 (file)
--- a/jjb/natapp/natapp-csit-basic.yaml
+++ b/jjb/natapp/natapp-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 5e913b57b9f28f10f6b0440c1127e7902768ea43..d8c10e852609fe6c0c6c94549fc77abc5e770ca5 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: natapp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'natapp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: natapp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index a0ff85b091ffb5cf1aae932259311f7ff1400f05..f83ef439eb7f09e2318340740167a69908ab2431 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index d0f45a6eb94202ad31d4127c6c587cca1f2eced6..d106107a3148f22bb68d07feee2e6335e0435275 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: nemo-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'nemo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+    archive-artifacts: ''
+
 - project:
     name: nemo-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 33d82c12e3a3518bd3b1d1378c358bd2ce4cb7f8..b7abddaa92649cfcde8a34b103b497ff342309de 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index a8b8adf53776b8dfd24c4ceff3c99fcc273112c5..4150339bb4f35633e5016441233a552e8ad115dc 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index b33e0f0bede39d49d5b662c66347bb63a7c06768..6db95f8bdf99b7f07029237479f1f713c5a60c21 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 53b5ebcd5ef16e45ebf6720d1f0613821d8fa460..c05e673179b59bf6d005d2e5640f50fc6af7028a 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 66bb266555163d261560a065a3cf4aad83c6fa92..54a9ec27ac6ca03dcde75409089793517b8d76c5 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 9ea3d0301a58d96a97cb98669b94a0f840df55a3..4e0115749366c777febaa9983b4cfb4b3a262da8 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: netconf-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: netconf-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index b6917ee7e9446e6b299c2130aa9e31c33a6a37aa..0fcf193d7092eaf4d2af1c25dafd8792f4e456dd 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 52ba702b62b356023d54fb45cbb422987647572e..4ad1774269e093e0f762880951c940f86122a714 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: netide-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'netide'
+    project-name: 'netide'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netide-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream}'
+    email-upstream: '[netide] [openflowjava]'
+    archive-artifacts: ''
+
 - project:
     name: netide-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'netide'
     project-name: 'netide'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 316a89c0a992569fa0b49c82ee3636b98b607a86..f7c04233486ff8bf7abbda0613421fe2d3c887cf 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -49,9 +49,12 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index ae1560b10dffc41453f5d1b69084f0ff987f2cc1..00c0e6fbc6360ccb0eda3b5fa079e49a986f728f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -49,9 +49,12 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 73a0c9f085696b99881947bbcaea8e24bcdc413b..ad53c5328efbe4de39c99467a90f8c5bf393077f 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -5,8 +5,11 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
           jdk: openjdk8
           jdks:
             - openjdk8

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 154224933ef697a6bc282d55501370d3d7f391f3..d726c0fbaac5d334395973a7f233ed46b14815f4 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
 
       - boron:
           branch: 'stable/boron'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 292f3cce90c118070bd8e06653e4f9b7bdb3a32a..4a40f149376242aaa5990d3003c6f85420df35e6 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: netvirt-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'netvirt'
+    project-name: 'netvirt'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netvirt-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream},
+        sfc-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+    archive-artifacts: ''
+
 - project:
     name: netvirt-carbon
     jobs:
@@ -12,7 +45,7 @@
     stream: carbon
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index c775346fb49060763eebb256ad629e4cf0b5144c..4eb63b6125a8924dbf97ac5590be8eab891a3cf0 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: neutron-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 60
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'neutron-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: neutron-carbon
     jobs:
@@ -13,7 +41,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 444967990a0f8ddf365de321c0ae07192ae8b592..7ab0b5a1961566bd9631c8069758999cea34b019 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: next-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'next-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[next]'
+    archive-artifacts: ''
+
 - project:
     name: next-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'next'
     project-name: 'next'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 962eddf5a5943cf750ba665d6d769dc29f4afdf8..ed3e98215bea680fb9f747fb635e5b32ab2726f1 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 29c1fc387fc8d98eaf9959c14c8d1f5ee3bcc108..c6db4387bc1dda231fb787e77b27881a48a070d3 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index db0e5fcd8b0a13dace540dbf4f342ad4965671ac..51f8a18f033a0ca28ba58769af12ca1d833760dd 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: nic-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'nic-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+    archive-artifacts: ''
+
 - project:
     name: nic-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'nic'
     project-name: 'nic'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index a0a5acdbbaa88bdd1041a0b29fc1a605d35dd085..6b6cc324d176ca6daf0ca8f9b5a6a23766b10f08 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index 300a8fb1f263971940a0948da5afec55f9cbb1ca..bb5809fb003d17011093671894d630cc5dab086d 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index c7e45b2ea6f637610d9b108a557e52091bdb450d..728f00bd119f6a14a893fc27d3175ba8ff32a07a 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ocpplugin-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: ocpplugin-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6e84bea1f63391a8bc07aa892620b3fa1a717a1f..35adcbff6d54d90996632ff12d74db82eb0b6e12 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: odlparent-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
+
+    stream: nitrogen
+    project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'odlparent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: odlparent-carbon
     jobs:
@@ -13,7 +41,7 @@
     stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index b1fdc626f80da17e7c9e7146d60ec61ea3e6324d..56458ff4a4c5b1a869462164654e9f1c2fe5ab49 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7796a8c695e8e043aa66518db416a9865ce86855..c02f9eb5f04effa224326e80847a1dca86ec1e67 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: of-config-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'of-config-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+    archive-artifacts: ''
+
 - project:
     name: of-config-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index ccd0d86c4f4181f6dadee5fd7179dc23a2843df4..ca6bcac41c9b1f0ee584792740ef2ae8eb623d2d 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: circuitsw-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ofextensions-circuitsw-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
+    archive-artifacts: ''
+
 - project:
     name: circuitsw-carbon
     jobs:
@@ -10,7 +35,7 @@
     stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 5108ae5b425fc5fe2d79e87a52b3bac28a05b1e2..d5242d379099ac17c204a554d838261dc4719e4a 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: openflowjava-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'openflowjava'
+    project-name: 'openflowjava'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'openflowjava-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: openflowjava-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'openflowjava'
     project-name: 'openflowjava'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
index ba8917f44c231b981c0980576de2a11c274b60eb..b2d6ee43e8a7310700908fdfee1aef6b4246cf76 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index d5d9eff14a04a046794e36162bd95f9f9084ee97..bca0ee34528001a5494a583d0c3be23a10e0f967 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index 5bfe2e28b32a7cd22e8aaf852c79d52156e58544..b337e58a456e982b3b4b97091a5a8620b55538d9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index a0ebbad819751740e612b9861fc23a8a3a9c0c0e..7f249ab4f195a92030fdd388c2fc934b8e959fd8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index ee61b31bdd81b4dd12738d44898a9baea1c3555c..afb19c9220651e79b63eb9da1d1b0da609a6250d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index a93fbbbcd5c286492d575a12087f86584c038efb..73641de366e741a9ca62eef9475251baa68eae10 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 45e0c6b3d9f5c64365e5bad3ee0dfb6430cb7765..e141f08a8246b8c2441feb013647f10904fab29f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 4f2804e214e59ec55fc217b2682124dd99ccc5d7..991b352ef6d8713fb57dc96f415cee523c2cab6c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 6ecd77dc013c00faa78597b7bd350ac9d103dd98..41c069444fa09b57a88c8d77aff194dcafbe57d5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index 7fe6ed19de7eef3152a082b3c92874679c899184..3754da4ae262b7a536a8a0c190b7551dcbbec91a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index 3b0b342dcd13f239dbce9d1ca8fc3b1574e9dedd..e7b516437bd15a45301fea6ac1f0b41f573c9c2f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 5dfec9d0e6fe6c8aa70de93ccfedf92f3c506628..9e5462c2a18f40551e4e4e471ef696d017102eea 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 2e7c2a625af63e8798b9361debdb8b79028a079a..1d659a4c1fbdeac50f1563ffbcbeeb62fa844d4a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
index 0301398677f63ad644fcd55b5535cc6047e397e5..732b09cb14f69ea6b79c9dd903cb394d56382166 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 68703fc769e310a56b6426c252288a385983e02b..1fe32c1ddbe9eafaa148f61652df73f6974dafed 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 685664a617bc55fb74b32ed55429e1ebec5d8ecf..a2abd6f3d7c4da962a3967e7e1ed511e2af43534 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 034eced4f5067de3f1ea9327ee42a46b2f8f81bd..2b5b564020e285c10457e9cc43202b62b57826d1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9723455e099d48700b61f8c4891643323ff2d327..8c6c18025594bbe7746d32685ce15966a6bcbcc3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: openflowplugin-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    archive-artifacts: 'model/*/target/site/**'
+
 - project:
     name: openflowplugin-carbon
     jobs:
@@ -12,7 +43,7 @@
     stream: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index aad0b09e6d6d0693d9eeabf05b6bf8182c7fd98c..a952b8a7bf9ec84d4fcf8933bcc92ec63c148bc0 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,9 +6,12 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: openjdk8
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: openjdk8
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index a932a9c848d4206b03033eedc14036eeb3f2b7bb..a962234065f7c1b663e08528f0dbdacbd509ddb8 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -7,7 +7,7 @@
       - 'opflex-openvswitch_tgz-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           libuv-build: v1
           libuv-scm: v2
@@ -15,6 +15,14 @@
           rapidjson-scm: v2
           openvswitch-build: v2
           openvswitch-scm: v2
+      - carbon:
+          branch: 'stable/carbon'
+          libuv-build: v1
+          libuv-scm: v2
+          rapidjson-build: v1
+          rapidjson-scm: v2
+          openvswitch-build: v2
+          openvswitch-scm: v2
       - boron:
           branch: 'stable/boron'
           libuv-build: v1

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 1608c00b6cf7076ad561cb852e9fc0a9da4c4d6d..2514943aa83e1c23aff2f188d40127029b9540b6 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 142e5e28d92cae773d3f22d8ae13fe7bd0c4da0b..16e13831a5f8ab43457359f5184d4e58dd74976b 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -14,9 +14,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index f0eaa9946906a9d19a9152c055849482925f4d27..bc0c2c723a9a65b3bc121d3465d62418493eea24 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,8 +5,11 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
           jdk: openjdk8
           jdks:
             - openjdk8

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 53fca673095ae8b55679f7cb98598cde1616074b..427bdcb46f87171bac9fd3c618d3e5e697966610 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,9 +8,12 @@
     project: 'ovsdb'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index bdbafe4d2ba63bf31416cad17c49b5f83d75e647..f16d1652ca9c8e7a075c76db4c2f9798d34a327a 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ovsdb-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ovsdb-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: ovsdb-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index fda260c8475dc4af461370c243f947b9cc8c97c2..aa6304a8274d487db4a0b81586e85998495cdb7e 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index b97ce62d7cd42c104bc73fe2b094a698c63203c1..7a78a5559e008f222c829d1ded05f53264bc3006 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: packetcable-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'packetcable-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+    archive-artifacts: ''
+
 - project:
     name: packetcable-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index e77a78d6bcbaf663f2a0f8d8c4ef1e92381afae2..950a74becf7ac64cab486754d5ae2665762b2f2e 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: persistence-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'persistence-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[persistence]'
+    archive-artifacts: ''
+
 - project:
     name: persistence-carbon
     jobs:
@@ -10,7 +36,7 @@
     stream: carbon
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk7
     jdks:
       - openjdk7

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index a640b5f4237828ef2d3a19fa1712fbed7eb45677..b37f5bbba3d499d671c1fb5fbb22c52c5ec1c4d5 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -142,10 +142,17 @@
 
     # Manual CSIT job lists used by sanity
     # and weekly distribution test jobs
+    csit-sanity-list-nitrogen: >
+        openflowplugin-csit-1node-sanity-only-nitrogen
     csit-sanity-list-carbon: >
         openflowplugin-csit-1node-sanity-only-carbon
     csit-sanity-list-boron: >
         openflowplugin-csit-1node-sanity-only-boron
+    csit-weekly-list-nitrogen: >
+        controller-csit-1node-notifications-longevity-only-nitrogen,
+        controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
+        controller-csit-3node-drb-precedence-longevity-only-nitrogen,
+        openflowplugin-csit-1node-periodic-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-drb-partnheal-longevity-only-carbon,

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f3740a0572186dcd5eaa2bbf794f6613e51af8dc..48ded16a6a9fbc9c81a12ea7942f79664194ea63 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: reservation-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'reservation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[reservation]'
+    archive-artifacts: ''
+
 - project:
     name: reservation-carbon
     jobs:
@@ -10,7 +35,7 @@
     stream: carbon
     project: 'reservation'
     project-name: 'reservation'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 513b1dbc1b6320e94e461848816f419326f2f325..b656769b2dc0ecaede92cfde6694928b6c8a4c14 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 97219042bc4c28d236f3c095d888891db039d791..31a7d7084c347cee9ca95f5027edd536c70e92c9 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: sdninterfaceapp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sdninterfaceapp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+    archive-artifacts: ''
+
 - project:
     name: sdninterfaceapp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 711de2c31dc0549c538d9e51b5865a2431f34747..79746bf45e013b7161a3f22fbb0f71f722617d39 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:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 2833782c3c7019e19dc4ba93fa4b4b94650ddc88..b574a85ba8189fe131fc9a731e27d589004eda7e 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:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index f7aab46eda6b760e255579f71cfe8b870018966c..0b14612fda5db85f989b56bd8e243744019a7900 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
 
     feature:
       - basic:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index d61f6b79baa4550a407f1c7f2159e343f178e1f3..ee2489e762cba06f221de852e310e298bb459f88 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -7,8 +7,11 @@
     # stream:    release stream (eg. stable-boron or beryllium)
     # branch:    git branch (eg. stable/boron or master)
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
       - beryllium:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 0816d98e2a42738ce7fe05742257c51b0004f27e..dbac35d27219884f88630dbe2af5c62e429ff67c 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: sfc-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sfc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    archive-artifacts: ''
+
 - project:
     name: sfc-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index fec71d89f20db94fb64f5f4fe4d3799be08ad526..0834978a83c8de5900f15518efcff3efe51e2de0 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: snbi-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snbi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[snbi]'
+    archive-artifacts: ''
+
 - project:
     name: snbi-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index e4d123d1b91dd1a036d22b39ef16a0158fc526db..feaadb60c10ccf4f9772f8fb528537e33f95d181 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 5503ffdd945eba8ddb4e75548ccb7960605626cb..7db03f57351e9c01f2e69d453f7221e2f115b73c 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: snmp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snmp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: snmp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index fb444e2e3c98bfa42ba214ecc27496e41b7b8548..c70c3a90ff29bdd8293ff3d27a3f34d66cf39b88 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: snmp4sdn-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: snmp4sdn-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 414d668ad79d6c1b30f5e5a92ef6eb4e4ceb0c4b..4fc6b2208c2cff3398ca0c431d67cd5df5d9760c 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index c32e756e87b9248b0086e4f0fe47713a726254fc..eba3bd59689aed3cc7284a215250e8131a89c10d 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index d0834f40a7647dda38b65bb91eefc6492f298610..4492e7ecb000a402788cfd074b1af79cde105434 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index b634427c8b58e235df966a5ade7ff299f8f8d372..b2ab9b500c4cc2319046e6e2f94ce25333892a0c 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 2a4081709e793dd2118fcded7065edc5107f1d84..39859880b6a6590d81fc202a284e2935e791f1d4 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 577c418828aab015a5ff62a8fb6c627420686de0..b1a86a7741e114265e67d1b4a047b1bf1af5c4e1 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 31e894bc19f9aa80d9987914138cd04f07b79ab3..f233596d6f9b58a841b5c7f2ce58f1f2020f69f0 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: sxp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sxp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: sxp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index c65b6919db4ed2a8765c0fb63adb1a0ffc15a5c0..a97bf69bdf7075130213d9f39b2b0deb6098707c 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: systemmetrics-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: systemmetrics-carbon
     jobs:
@@ -10,7 +35,7 @@
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 33e543297ecf2f5d561b05e4bb3de0589e86024f..d38d6f47dc50dcaef226b948128bfa852031f67b 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: tcpmd5-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'tcpmd5'
+    project-name: 'tcpmd5'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'tcpmd5-settings'
+    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: tcpmd5-carbon
     jobs:
@@ -10,7 +36,7 @@
     stream: carbon
     project: 'tcpmd5'
     project-name: 'tcpmd5'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index e93045fcee340ae5d41901871042e2b3b6c1b394..ebb8a8f48ef1b1a0bb1caa697ffd881f71d670fb 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 9177b5289a20f475d2685b455d33f63886e7f525..fcc51b7af3e6e46522b631163ebc405bc39e8a18 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: topoprocessing-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'topoprocessing-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: topoprocessing-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 52502dc9b5808c4451d548094ad953ddc4cd18e2..37726167c2d33da7b3879a96773f808f39f5e3d4 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: transportpce-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: nitrogen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'transportpce-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: transportpce-carbon
     jobs:
@@ -10,7 +35,7 @@
     project: 'transportpce'
     project-name: 'transportpce'
     stream: carbon
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index f9b18a572271e7ace5c5902a1bbe2ffaee807bd5..fbd793f4724d0b0451f8b3a3dc559df3dcbe528b 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 974b5594aa5fe4c91be7b362f01d81c2cda79ad9..b4dcbf2416f84d8d6b54682ca9cd1f37d815b798 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index c3520844876e364bc53327c16483422c9bdc4644..54c2ccb7ca478fc685dfc9973a5c5b28a57f1f97 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index d34fb0494671617fa799c361f8575b286e3175a2..4de2fe4dcc1d67822782686585100ec5e521ba66 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 095d98438d73b311624dc4bc798ac4f25e267ef8..127d46273d6e9e670009208ae2c5bdea915ba1cd 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: tsdr-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+    archive-artifacts: ''
+
 - project:
     name: tsdr-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 26b1598b32ae342e0cde4c38440d542b5648599f..86cfe80ceb984869b82557dee019b9b915271ad4 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: ttp-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'ttp'
+    project-name: 'ttp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ttp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[ttp] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: ttp-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 1310c4f7170fd1a976569d65cd91c4ee7562e1ef..f537bcf22e3e6d1db1a6ba2b6d0c1e4b56052256 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index d374f188c8eba5f45ab680bcb31de9335cec86d2..973a1a9fc563a6fb08094b1ec0e7ffb0a18c6df1 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 3f692b74a91cf4abefd7d0a4439c97e84df17694..983333125de153af2a9c29f533aaa457b80dfa75 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: unimgr-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'unimgr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    archive-artifacts: ''
+
 - project:
     name: unimgr-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 516ff2cf733e166c4e8ec71fe1001c178ebb0df1..030b5258649a2577c1ef073b3f4c1b8cbe26f20a 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 128ce4220b54b1f2e42a4851ec6d609932b9a086..cd87d475481534e592ec7bda6586d4671eace644 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 32ae9455a3b94943b510af57debded42d8aebd1d..1b9edf438d0ed51e27698d31a6fea56c5d34d0ba 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: usc-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'usc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: usc-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 9e92258308d70421ca78a1842c4093a6ed51cdb4..dae05f0719e8d3c2f23e01c073907e5342c06217 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 8b13afb2039f3d09b79f8dfc840985d4a81a0c07..af91d9dbec90b3461c4fd486d082bdb6050a2a2b 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: usecplugin-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'usecplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: usecplugin-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'usecplugin'
     project-name: 'usecplugin'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index b6864b656c6be013bf2488c638b65720f8c26719..70fac7b56f4dfb097d1a26424b189ba041a9c11b 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 033f82f50862055376783237ad5ff5b894062534..d1df4c7311c694ea82d261ff20f66f0e5d7b1101 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
           tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
       - boron:
           branch: 'stable/boron'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index b1e55ad5d5e21ba8001a9283b108818a3d0390da..96d10bcfcab2518ace506ac88d70923dfbc43e0b 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -13,9 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 960e64f6d68bce1771212395b8939358a2836331..6b56eaba86ddb8f1511f674f31f5753073cf9443 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -20,9 +20,12 @@
     functionality: 'neutron'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
index a19aaa85cdfc4dea13dec8fc42a6b971b71e7923..6ce6addca3b3961bf1a66a9b91d2524c1b215fc5 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -11,13 +11,18 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jdk: 'openjdk8'
           csit-list: >
              vtn-csit-1node-manager-only-{stream},
              vtn-csit-3node-manager-only-{stream}
-
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
+          csit-list: >
+             vtn-csit-1node-manager-only-{stream},
+             vtn-csit-3node-manager-only-{stream}
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index ce28ce30c6fa1e271cf0cd39701f92d622d0794a..3772421016812ec274ff1b4f578732b51dfb2e01 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: vtn-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'vtn'
+    project-name: 'vtn'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'vtn-settings'
+    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
+    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
+
+    # Please do not archive maven sites!!!
+    # Maven sites are published to Nexus at:
+    # https://nexus.opendaylight.org/content/sites/site/
+    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
+
 - project:
     name: vtn-carbon
     jobs:
@@ -12,7 +43,7 @@
     stream: carbon
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 31b89fdec28bd5ac2b10af1a7f06e754cde78362..610165962ff572f5881259802f4c52b627c434d6 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: yang-push-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yang-push-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[yang-push]'
+    archive-artifacts: ''
+
 - project:
     name: yang-push-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index e40378e5e2a45cbf0b8524bec1331aa1824256dd..f6aa2617fd5545496ee5c42a9db0cabbf8240c14 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: yangide-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'yangide'
+    project-name: 'yangide'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yangide-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[yangide] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: yangide-carbon
     jobs:
@@ -10,7 +35,7 @@
     stream: carbon
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index f00e35ec690527d816c9beaf1e1b916dfe967459..fbbccaca456cc1fd22cab57ce8b8df6b01e20b24 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -13,9 +13,12 @@
     # Project branches.
     stream:
       # The tested component was only introduced in Carbon.
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6dd2316fb132acd40d9640d8e5a142594f426eb7..fc0f7458454e7d139aed746418c3934de1063011 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: yangtools-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: nitrogen
+    project: 'yangtools'
+    project-name: 'yangtools'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yangtools-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[yangtools] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: yangtools-carbon
     jobs:
@@ -12,7 +39,7 @@
     stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'master'
+    branch: 'stable/carbon'
     jdk: openjdk8
     jdks:
       - openjdk8