Stable Boron branch cutting

- Remove pre-boron jobs
- Create boron jobs
- Change beryllium to build stable/beryllium

Change-Id: If646d01a23251ccd004a0b995ddb2d20ce10b910
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index be5a4bd7e22a2428761f1fde279186c1decf19d1..9ef0c6a1af847f4f14bc1aa9cee368a0e288f00b 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 3f61cf095edc3332f93165774efdf9b504197781..18f0c0f99f619f163271fa200e6746bf665d3050 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
index cbd3ee27fb8596e10426c5e11cef69ce001c0414..242f324a3a095219a9ef955ab942156d2be2aeed 100644 (file)
--- a/jjb/aaa/aaa.cfg
+++ b/jjb/aaa/aaa.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index e4be41336ce9cf64abb9918580be5812689fab1c..6e487344a406823709c86eed58ba4605070e30c0 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 185b32b634686e828a1b840f6084a0891841e97f..90531b5c8bc0ab56f3cd32f4414487270a2efe2a 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index defa8fc8998ff420e8c9d2d83515f5276f0efc15..e91d6c105c50399c43ca8ee171c75398b2ca6dc7 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index 3cecb364fd54525f2e6a97461ebad7f2dcb4de7c..6fe768020326ca10f7841326da80a69107b8338f 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -1,9 +1,9 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk8,openjdk7
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk8,openjdk7
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index db908131b2b050401a9d2e91adede2b5750a0df8..86c72dfbb5fc8527be66867b9289a5b58080c2dd 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -7,9 +7,13 @@
         - 'autorelease-site-verify-{stream}'
 
     stream:
-    - beryllium:
+    - boron:
         branch: 'master'
         jdk: 'openjdk8'
+        integration-test: boron
+    - beryllium:
+        branch: 'stable/beryllium'
+        jdk: 'openjdk8'
         integration-test: beryllium
     - lithium:
         branch: 'stable/lithium'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 799dbae4d0ed39a4c4e239d4493a7fa78e985759..b0ba0ec7bc94107ddae6a0447426f20ff55ab4a4 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 6a499cb9a724412957638e5cbee12d17f8052c49..cfbc4180fd3c9c55e445fae656acbc7974550191 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index cc3bb405725ad45f8c30dea33c297b740d96029e..37033e5df96c022113324c19515eaa4667849443 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/bgpcep/bgpcep-python.yaml b/jjb/bgpcep/bgpcep-python.yaml
index c7119d2d5cc5cd3a7dc223967cec5875946a82ac..d4a2975749e20a84e2b6c2c4ee6224defabf7ce8 100644 (file)
--- a/jjb/bgpcep/bgpcep-python.yaml
+++ b/jjb/bgpcep/bgpcep-python.yaml
@@ -6,8 +6,10 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index 0f79755ad962d64253b7f6d3739f30e7edc55b35..0d2b7672748b281f008e90dddc6d602edb9bc62a 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 3ef607559ab083ea8b7a2b5c9d99da792d9d61a7..bc56921cfe5ee6ce8e39ab2a606138943e1c876d 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index c1d6dbb7cab01293825e73f246029a9ca3f1399a..1e2e1ed7c4663956340504c23a829bbfa7aa3a64 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -1,9 +1,9 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: beryllium
     jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index c813b1d5afcc1fe43bebdd06f79a3066c455cf8e..b1151e72581c325d891c47bc4863cb2ea4172936 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg
index beeb4c1549d9c25f1ff258a4c19cf4fe6fa7774a..0708008fe4cfae32a5a3f3d8e6dafb9d5623dea3 100644 (file)
--- a/jjb/centinel/centinel.cfg
+++ b/jjb/centinel/centinel.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 9004ab113adac7643fe61707c8259d245b820461..9af7c48017f390ab2c054edbb644b10889b79131 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 89322dfd79d04941e81acaac1024b69a8f98a60a..49c1c4a500e8ab98590482b8e3285d3a4aec3caa 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 3fd75b10993702f89daddc981fb219b41d2f8d8a..341287fb328a4dea447a5b2c4b72447cb0734006 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/coretutorials/coretutorials.cfg b/jjb/coretutorials/coretutorials.cfg
index a467865d3e3843cf6f158d15cc90243703f2e5b6..f47778a0490d103f06fa97138c394408562ad6fe 100644 (file)
--- a/jjb/coretutorials/coretutorials.cfg
+++ b/jjb/coretutorials/coretutorials.cfg
@@ -1,7 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk7
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg
index ae3d9a4c8bf481fc90bbbab061b36284d53658da..7312628e73eb5670b5166eb5cf6b70b8c160bc9b 100644 (file)
--- a/jjb/defense4all/defense4all.cfg
+++ b/jjb/defense4all/defense4all.cfg
@@ -1,7 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk7
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg
index c07856ed27d0da4746a12518592f1c9e111b1499..17c8ebabfaada5b8e7f7352ed058668923833907 100644 (file)
--- a/jjb/didm/didm.cfg
+++ b/jjb/didm/didm.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/discovery/discovery.cfg b/jjb/discovery/discovery.cfg
index eb87e8c8b067c19ee35b1c3d7f0435a39304846d..0c84df3e8a0c998c3020bf19995e87f19beabd68 100644 (file)
--- a/jjb/discovery/discovery.cfg
+++ b/jjb/discovery/discovery.cfg
@@ -1,5 +1,8 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk7
 DEPENDENCIES: odlparent

diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg
index b7e79a5d1f87c13ddf4083b4410337955551241d..98da554a410afa0ef92953dff905e08f3ccc7a1e 100644 (file)
--- a/jjb/dlux/dlux.cfg
+++ b/jjb/dlux/dlux.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
index b7e79a5d1f87c13ddf4083b4410337955551241d..98da554a410afa0ef92953dff905e08f3ccc7a1e 100644 (file)
--- a/jjb/docs/docs.cfg
+++ b/jjb/docs/docs.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg
index 90638fa4762324da9db277266611ff8e9b7e6ea5..9eb7e0148b9b9b5289fa5986037a74d7d9651d58 100644 (file)
--- a/jjb/faas/faas.cfg
+++ b/jjb/faas/faas.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index cad55f3a2672886943f4f20bef6e39c855d23e98..c195151809d766276c7c50f851ed0266439a1e5d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 604b801239163fdbd591a29a8031d6992d83b666..f330303b028f5e07e071a3c1937845b6bcc74a36 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index c66cb5ed81927b2a0c92c159931f622d62ea1af6..fc5c487348fbefdf5a373b3a47739bed090b34cb 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index 533e14d873c7fc9c096788a5980bfb54c6059e91..c6e3292e32ab83b262a68e08e7f6c62b0082e079 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/integration/distribution/distribution.cfg b/jjb/integration/distribution/distribution.cfg
index faca08da6cf82f1d98713a51ee60eebe07d28d7c..3dbcb82cd52542784524066036608d3379b55bab 100644 (file)
--- a/jjb/integration/distribution/distribution.cfg
+++ b/jjb/integration/distribution/distribution.cfg
@@ -1,6 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk8,openjdk7
     autorelease: true
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk8,openjdk7
+    autorelease: true
 JOB_TEMPLATES: sonar

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index c4ed20c51d51899491fc81df20eb08ed1f34c3c7..432747921af24d23ef6ffa49c8d7e82547034176 100644 (file)
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -14,8 +14,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index fd2deac2ee4f9a411a9af3c531e3028f375c54f3..e85e6374ff2d3b9237a7d7e247049232e7012eb4 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -9,14 +9,12 @@
         - 'integration-patch-distribution-{stream}'
 
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
-        - beryllium:
+        - boron:
             branch: 'master'
-
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
-
         - stable-helium:
             branch: 'stable/helium'
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ef50a8c6fb9626e3db76ead70ff9ca670cbdea82..cf0c9fae1bb84fbf02e4631114fcdd0a47551455 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -9,7 +9,7 @@
         - 'integration-multipatch-test-{stream}'
 
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
@@ -58,6 +58,55 @@
                 vpnservice-csit-1node-vpnservice-only-{stream},
                 vpnservice-csit-1node-vpnservice-all-{stream}
 
+        - beryllium:
+            branch: 'stable/beryllium'
+            csit-list: >
+                aaa-csit-1node-authn-only-{stream},
+                aaa-csit-1node-authn-all-{stream},
+                bgpcep-csit-1node-userfeatures-only-{stream},
+                bgpcep-csit-1node-userfeatures-all-{stream},
+                capwap-csit-1node-ac-only-{stream},
+                capwap-csit-1node-ac-all-{stream},
+                controller-csit-3node-clustering-only-{stream},
+                controller-csit-3node-clustering-all-{stream},
+                integration-csit-3node-basic-only-{stream},
+                integration-csit-3node-basic-all-{stream},
+                integration-distribution-offline-{stream},
+                l2switch-csit-1node-switch-only-{stream},
+                l2switch-csit-1node-switch-all-{stream},
+                l2switch-csit-1node-scalability-only-{stream},
+                l2switch-csit-1node-scalability-all-{stream},
+                lispflowmapping-csit-1node-msmr-only-{stream},
+                lispflowmapping-csit-1node-msmr-all-{stream},
+                nic-csit-1node-basic-all-{stream},
+                nic-csit-1node-basic-only-{stream},
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-scalability-all-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
+                ovsdb-csit-1node-netvirt-only-{stream},
+                ovsdb-csit-1node-netvirt-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                snmp-csit-1node-basic-only-{stream},
+                snmp-csit-1node-basic-all-{stream},
+                topoprocessing-csit-1node-topology-operations-all-{stream},
+                topoprocessing-csit-1node-topology-operations-only-{stream},
+                tsdr-csit-1node-h2-datastore-only-{stream},
+                tsdr-csit-1node-h2-datastore-all-{stream},
+                tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hbase-datastore-all-{stream},
+                usc-csit-1node-channel-only-{stream},
+                usc-csit-1node-channel-all-{stream},
+                vpnservice-csit-1node-vpnservice-only-{stream},
+                vpnservice-csit-1node-vpnservice-all-{stream}
+
         - stable-lithium:
             branch: 'stable/lithium'
             csit-list: >

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index bc1882fe02ab386f509d0e20c52beaee851824e1..73253f7cb53b9954925e4c3dece409d909cb68b0 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 467677d519a743e42f5e3b545e5290d5110aef56..52a0e7b26b975f0576507db69fff5f173c4486e9 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 8524b7a268918332f34fcde1024d13b7627bccf8..640d0bc39ae2a9537415734436cbb5151078d1e0 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 4ad7fd8d0243567b482ec25ded6d0a22b36adc75..b951c8762b541131571a8235d08d34cda84b3e57 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 89021117eaa99c85b59ec27d88df219bf8f32722..56be3d3581cd4ade147580a4be29f4768f24d5b6 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index 469b8c174553c4e186d0af716cc1467c829ec036..23a5052862b46d306788ffea6fa92e05d8421152 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index e4459d6178ad1aaf5f2c1424c2409f659218070c..e8f3fe526e6560f32992bdfb32c8c29dbd7a990f 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
index a8ad7be4925fa39d895020d7ce1f1720e29402ad..36a241fdfa39bc1eaee57df7e360535ad67e1700 100644 (file)
--- a/jjb/lacp/lacp.cfg
+++ b/jjb/lacp/lacp.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 985c1e2300a8ea9c75ebbb9e1e595c4a09f28963..c0ef799b30f3179736cdccc72a0e1e11a7388cc7 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 9806abb85b100f50dbb5b4145186ff0e1342bc18..d6a5e614da57eada8bdc6200a6d03b9a28516a01 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
index 3ad0f2be412dada0255a5be3630d3d1bb72aab9c..a5ad2b6c7983cd3230cad039e5a4b83a41706485 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ b/jjb/lispflowmapping/lispflowmapping.cfg
@@ -1,12 +1,13 @@
 MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
index d13c18441f7efe4149414eca97ed4c687f78155c..eb5a58aff34ef8311b138fe8427d979bdef66f83 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index 4ff8636d2a28466d7d757b17463e331c5f5d052f..08dad7035bf4f4079ca3e1e5014e88a006974852 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
 DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index e0cb5077c6e11423d4a653cd3431a66a4cf130a0..1f7a0d7ff0344c8b151f2a4e8b12907a0c72f9fe 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -1,9 +1,10 @@
 DEPENDENCIES: yangtools,aaa,controller,odlparent
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 5e759d01351189c80cb3a76340bf09278b70bd96..5540d97de029af2b0bda2b3f9040b116303b1957 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
index 90638fa4762324da9db277266611ff8e9b7e6ea5..9eb7e0148b9b9b5289fa5986037a74d7d9651d58 100644 (file)
--- a/jjb/nemo/nemo.cfg
+++ b/jjb/nemo/nemo.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 4b3b45474ccf19c9210427d2b852bbf396765126..314a2e150ab6e36eab9b94bfc5145032b7bba1eb 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 580649485edb97f19dc2cb8250a2a26f271b9370..33c265025c2ef9e097f061df014307b5fc2cf519 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index fc49545de55a33ce45198d73ac7804b640ade0fc..1f20441c17fffb273a3fc0f31dc66096e12bcc0c 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 23f3202acdac99f0fee6bfe35b889154a3860bfd..a461eacc5d18a6e964cc0d8e4193a00e08d83cc5 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index 0e09d32d46e1779fbc77bc09ded8b7ffee889f64..7dfad3740436c9078fe13464fe89769e81509bdf 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -1,10 +1,11 @@
 STREAMS:\r
-- beryllium:\r
+- boron:\r
     branch: master\r
     jdks: openjdk7,openjdk8\r
     autorelease: true\r
-- pre-boron:\r
-    branch: pre-boron\r
+- beryllium:\r
+    branch: stable/beryllium\r
     jdks: openjdk7,openjdk8\r
+    autorelease: true\r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m\r
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava\r

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
index aaaa3978c0ffc35a6ace94dcd000e1a0a1bd7835..c905a57ab099802138a133241df2561eeadc68be 100644 (file)
--- a/jjb/neutron/neutron.cfg
+++ b/jjb/neutron/neutron.cfg
@@ -1,12 +1,13 @@
 DEPENDENCIES: odlparent,aaa
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index beeb4c1549d9c25f1ff258a4c19cf4fe6fa7774a..0708008fe4cfae32a5a3f3d8e6dafb9d5623dea3 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 1d7b48290e2a30fd7ba0dbe304c34397184b7cab..0baf9a4dcd635c05cbd64599a4dee8c36bf0b416 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
index f5a103313ee9e16b2446e1dbb74e6a87c98300d0..f6cb7b747f87d085aead09116088d66dec3f9f3c 100644 (file)
--- a/jjb/nic/nic.cfg
+++ b/jjb/nic/nic.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index b7e79a5d1f87c13ddf4083b4410337955551241d..98da554a410afa0ef92953dff905e08f3ccc7a1e 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg
index 7b2c9d81517c116b5c46e6e7a8b31050aefbebe2..fd1718809da56702d96313e067cae86822cc1958 100644 (file)
--- a/jjb/of-config/of-config.cfg
+++ b/jjb/of-config/of-config.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent,netconf

diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg
index f27b7731111f2888b76791efb0551e8f38b0271f..ab4492c7986df438af6b5fcc8b0d4603437865f2 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.cfg
+++ b/jjb/ofextensions/circuitsw/circuitsw.cfg
@@ -1,8 +1,8 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
 DEPENDENCIES: yangtools,controller,openflowplugin

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index 8f75acb62e8f2eb0d26e5fa5167ca7708b10a977..8f5dc6c3d3ac34c5c3bbccb75d88ccbe61e9a709 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
index 13d5a3cfad7437d4ee2b5ce23749030850806e6c..5fae0edd86f20a503dadb805ade6f80119239e35 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
index 2657a18159d3b5092c4965192f9ae05a21b1e957..e76dacc4cce233dda15e9bc49f1160ddde8b985a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index c92b1b9c642a8259126cc70ddb5ae226920b5f49..8b21e0a7fcbb4f2e80074f9e2b53b40d00c567b3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
index 7fef892cc96b9ac5f8352db5209f156d2a6e70f0..ef8109471191fa60fe8a257f03827e2a9f53d562 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index bcb74b6aff48031a7576dc5b0cd08db6afb23b47..7afd5d1867635bf4bea8c0520044951037ed109a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 9fc5de8dad89b5d41b47a2cc22b8d769ac7e962e..ba02036581471a5c22c338265d030796c9f7ac35 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
index 9f66d88986ae4455bc23507490aa75b73b5e8a58..d4c8f204e1127bc7ca1f232422417b70502103e9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 8abbef49c23e8b78324b6c67bce33858e02141fd..8ee3b185ad251bd8a5211f51c9f11f238b1e3c12 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
index 4710056b59e692116dc66d391123053d698267ba..9d9002584a1b593afa3eb4a243339b0277a2bf2f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
index 5e090b828fd2208d9e409d30691cf04824009d90..4bd1b7f64f0cf331938a49f69739844f3e9ca06f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
index 9426fa97b69966b8f6a5f872727f4282f8ae7317..5e251b1c03ecae1ec9d96f86b9a1301fb846383d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 46f67982a4344a37139acc8c2c063b03adfb647b..299e599b37cab4cedd00eabc1f31b92c4ee8c67a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
index e0961c524790d0336e50bbcc355470e2d77dc400..beef22f7945ce35076a5754a57c4314b59d50a36 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 1381fd6806ac4530a772145920ff6fae74e486ea..f2ce6f9d506d5586bad7a4a92604118c08ec334b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
index e142f59f5af5e218205dfde0fcaa09fd848b7123..73f609130a2832610b5a53c534b42de5ccfdc66e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
index b04c08ff07003b0ab8d6ffd57242a72e1dd46911..f86eca21ef4cd086c49fa43d8f2ddfb419fc3826 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
index 183bff711d4ca8ce0170e96bfc6059bd9d6d48a4..534af2ac7e2261a8a25f9830505c7cd6fd54d608 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 1acc99a01f873568f8d1d699c93f7291c7a57a7b..fedd2c30e39cd6f613db3c07074ad96a2960247a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
index 221ea7be30835f9c4518bd91bd0a4cf1dea8d182..e14a6f73191676fb2e5fda01185ae87716d65007 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 419c0acc04ca8347a83982ee4f4198420e559943..e98cfbc348feaee9ee5cba8c1868a7ae51777b05 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
index aa2e1d3a8a7f58ee226e92de76c8a3c01436e95d..9598ce0b1fe4d8faa0ee49689103f04af6c69fcf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 4a81401a80943856ac8ac6cbc582e8e747811bfa..eee00221e006eaa2ea557b9feb453ecba9dbf54b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
index 67a9645b69cac76be2d1947169ee35f5096d6c10..4ca8ded163d84081605b90d5866bcbad479dfeb6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
index db3de0987881f7ab5e66eb519c30177862c506dc..ad95d3698adea6a926626d28929b17743bce4a2f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index d4fcb3da9e33896890fbd6b2ccb5f73a4d66c160..d7aa3a9c76a152a0830149e1ba263fcd50e983ee 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index cde1e4ce512f8fb9cd173c86a3b100c932f7e6c9..a293df9139f0677d00c3043ea4e7a15be14140f4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 186d91e3aa91cc4b7a39b8e6bb441f06ab1e1907..ee676cf3de7f6a709eef80e7570cc37c7b7e2fe2 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -9,11 +9,16 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'opflex'
 

diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
index 8f4291d250f4827149ab7f893c7216325b6e6fb4..fa278236357152a29a5ee4cdd6795f06e5c09d3a 100644 (file)
--- a/jjb/opflex/opflex-dependencies-rpm.yaml
+++ b/jjb/opflex/opflex-dependencies-rpm.yaml
@@ -5,11 +5,16 @@
         - 'opflex-openvswitch_rpm-{stream}'
 
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'opflex'
 

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index d4a1d55e6a0339dbe0eca39a9f557bb9c4f0016c..666de56582953fd50226d5e1baa499ad82cdccda 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -6,11 +6,16 @@
         - 'opflex-openvswitch_tgz-{stream}'
 
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'opflex'
 

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 37efaa775d8fa883a16bb405aa7f061431a631db..4b941192c067bd96d05387d7ae3f954eaec47342 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
index 2763d37b4f41bdbd1a8d9ac0ad9495c5b26e7fac..811c551f0cbfc0a00cb38472fd1f96236ca63fe5 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml
+++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index a87998156f49ec3dc8bb8f6e7451d0b0fea347e3..ea17f351bf82913dab24a1cc289073ea959828e6 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 52cf7ace31f95c2b063aa47aaccc1c17575f37c4..aea82e45d4da1e732ab2251faaeacf89ce0c135d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 8f5565b09e1516c2d3769ea4170d8bfe3cba63cb..d6fb1ad27409a431c54c5743701c4c1122b66ece 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -6,11 +6,16 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index ba0414062d8cac0b4994a448e0410e4bcaed0f82..f179066c21d90891a9a695ccc218a55dc0191731 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 43dbf815e67417fc6be68bd1fce379f23cf32b36..32307839697fa8a5b4dd74e0ec69540dc8dad17b 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index 633f6d5441508499ee2a4226ace103f66b60988c..e7160d9a020cd4281215ab2a6e62f684a63c9593 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg
index 3e7915f7fda3dd82d382c9a083742b09ccd7146b..80c15af11002f0efa50a47a7a91c54668ac1d378 100644 (file)
--- a/jjb/persistence/persistence.cfg
+++ b/jjb/persistence/persistence.cfg
@@ -1,7 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index b8ef2c800f8d655c96a8356662117cadd82c03a0..c8c58449435608385af9b83fffa6eff653807ff9 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 3a385c2f278d77b190a8d3b1dffe3387f3984196..d29af4fa47cf8258e293d5fcd1a136acbe3f8817 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
index 6142ff99cca4f64b7f819bb8b22c87a8baff919e..75f57e970fbea5e69c55063056571e353d3d7d4f 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
index 363210e18e189b01f5e80a7ae2c5043a2fab6b48..36514ba602040740027671a820f5a8118c590cf9 100644 (file)
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ b/jjb/sfc/sfc-csit-clustering.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 8839563fb3554abcd910ee5136f7107885b6b73d..88ac908f8c141bbf6e58a900ff72ff96555fd5ec 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -6,8 +6,10 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     project: 'sfc'
     jdk: 'openjdk7'

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index 1a95bafafa9fffc1df0fdea978d6aac6ecb6d777..a1a4f93cbe16ddcfd338b5cdaa02fb91ad88d213 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
index b7e79a5d1f87c13ddf4083b4410337955551241d..98da554a410afa0ef92953dff905e08f3ccc7a1e 100644 (file)
--- a/jjb/snbi/snbi.cfg
+++ b/jjb/snbi/snbi.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index 1bc7c24480c9f3d2f230cecd9eed65a2f72aaa6e..41eb2f79fb3ec5dd3b47ec68374daeccd0f065ed 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index 4d4eb61a8af6927943f50fbb34ca4647bcc2d030..f7c344016b7a4ea57ad0377e8f80b4eeda652d78 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
index 0521834bc069479bb09ce403fb79e765ba7d73fb..8ef69213a31582796a775676e6624f31786addcd 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ b/jjb/snmp4sdn/snmp4sdn.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/spectrometer/spectrometer-python.yaml b/jjb/spectrometer/spectrometer-python.yaml
index 179c08168d17591e5d082917d87b67964d722cc2..f4ce5b8c17dc4e0081d1a80f3679c9c8a91dff98 100644 (file)
--- a/jjb/spectrometer/spectrometer-python.yaml
+++ b/jjb/spectrometer/spectrometer-python.yaml
@@ -4,7 +4,7 @@
         - 'spectrometer-verify-python-{stream}'
 
     stream:
-        - beryllium:
+        - master:
             branch: 'master'
 
     project: 'spectrometer'

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index debe10e493cb4acf89a96b0a8c17d5985961d327..01db60f5b509c56fe91e802230958801b6b383e3 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 4857af774f70713695af7e431a02cbb16389ca85..b84c79784c87f277db70468333bb60694f5e524e 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -11,8 +11,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index 1d41cea5bface79c83e0959fbfa75cfcc5d16e9e..891229cd064f28c4ffb26b266f634e945120b21a 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
index b962bcda3b1e56eb7ced367f932ee563a080d679..64e8794ae75de48e95524d6114a8ae7ae42e6346 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ b/jjb/tcpmd5/tcpmd5.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/toolkit/toolkit.cfg b/jjb/toolkit/toolkit.cfg
index 7510cf22563584035f1add76d9b3333c7168f41d..709de265c66b7adbd1b471c5399d8e562096b55b 100644 (file)
--- a/jjb/toolkit/toolkit.cfg
+++ b/jjb/toolkit/toolkit.cfg
@@ -1,5 +1,8 @@
 DEPENDENCIES: odlparent,controller
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7
+- beryllium:
+    branch: stable/beryllium
+    jdks: openjdk7

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 0713090ef6bb62241c1b92e2963ea6af66491c52..92b68fffac680fd9738c3f732a8e437574ad55e6 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index b52890e6c9fa9f4cbbf7673313b9fa7adb80e0af..241ffc23d700b50689462d038e68050ce9201b6c 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/tsdr/tsdr-csit-h2.yaml b/jjb/tsdr/tsdr-csit-h2.yaml
index 30f8d7c2a17ab8e19be2c8f15d2f518983f3476f..2efed7aeaeb6daf04fc82569b829c1dcd2cf7550 100644 (file)
--- a/jjb/tsdr/tsdr-csit-h2.yaml
+++ b/jjb/tsdr/tsdr-csit-h2.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index bb096260c5a53864ba300eaca553d9cec1b09737..f632eb01d2d1a98229a50e71cdc2222cd6146d95 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index f43f8264c602c4daec60417e5af00b49882d3fbd..2bad21e5c362f18b402e8a3acd01ea3f3f590c17 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg
index b7e79a5d1f87c13ddf4083b4410337955551241d..98da554a410afa0ef92953dff905e08f3ccc7a1e 100644 (file)
--- a/jjb/ttp/ttp.cfg
+++ b/jjb/ttp/ttp.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 28790532d5fceb7ff41e16ca631efddb8875efea..10e2c19a269ec298bb90aa6e08659ca401902f61 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
index 70b07512d90b34c85ce25cc8d916fb1ddf011ef0..075716814dd3c0d887e7c86902165f9745b2b719 100644 (file)
--- a/jjb/unimgr/unimgr.cfg
+++ b/jjb/unimgr/unimgr.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,yangtools,controller,ovsdb

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 2d89762396b501b114bc86e697785f3ed20cbbc1..20d50101be07f0c393c733e59c56bec49cc2b89f 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg
index c9f11b823bc59d7d11adb1e68f750d9e5a977a73..be2e5973a151c68310a97d412fdf0ddb512df38a 100644 (file)
--- a/jjb/usc/usc.cfg
+++ b/jjb/usc/usc.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk8,openjdk7

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 1b7da38622d8d4af9e75d5ab35b4843818b3a95b..a16717a2b7131f28c8bcf13855340e73a7f40e72 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/usecplugin/usecplugin.cfg b/jjb/usecplugin/usecplugin.cfg
index ef4b316a269e053477e7af999f61be55a88b552e..f388e2c7129a422afd8c5c630d51049b415f4794 100644 (file)
--- a/jjb/usecplugin/usecplugin.cfg
+++ b/jjb/usecplugin/usecplugin.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: openflowplugin,odlparent,controller,yangtools

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index 6765767acbbb7b5e1d4136db0b53b7394b64c9db..8f80816ef12794c767c5181827ceb9fe9246faa5 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 675f645044d402ac3893485ea6315a5733424332..a8f6295a34ffd8b91570b33fc14b7f1a83df8151 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 88d615347545aded6018df8e7d76166565aaa3b2..3c19e4e1ddc624460476467c1900d3d0b4eb395d 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-#        - beryllium:
+#        - boron:
 #            branch: 'master'
+#        - beryllium:
+#            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index bfd199bd862cb395adba9524d187c2ef93501dc9..c9a5716ef4d790eb95a6e6bd9510a76d1f1c6049 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index e94fb565bbcfee1ab9e94861f274bd96b1d6a27d..843bfa6b60293a5e28c0bba2aa7e1a262b823bd5 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg
index 90638fa4762324da9db277266611ff8e9b7e6ea5..9eb7e0148b9b9b5289fa5986037a74d7d9651d58 100644 (file)
--- a/jjb/yang-push/yang-push.cfg
+++ b/jjb/yang-push/yang-push.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 4dab955d050db602e16d2a8276486e58dfee30c2..a0c7ed464d98e5fa62b45fee8c7f44846a90c708 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -17,10 +17,10 @@
             mvnver: '{mvn33}'
 
     stream:
-        - pre-boron:
-            branch: pre-boron
-        - beryllium:
+        - boron:
             branch: master
+        - beryllium:
+            branch: stable/beryllium
 
     project: 'yangtools'
 

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index 49fff120f1c044f3849ea3bcf564d13fd8f2476e..d13c48fb2159ef5e6d873856d09dd9305d7e70ec 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -1,11 +1,12 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8