Merge "Generate dependencies.log before building"

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 75261fe4713a2bf6de3ea216c2f70689df3396e3..2870b2401387ae576ffbf8866a799844efad8641 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 97aac93f3b437ab9d4eb50e2a15b13f1d8d5b2c5..3558d90de08c7664bd704967a4207a9c0bb62e73 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

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

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index dd694f9ee5e43d9fb44696cc71b98a1704bb6f3e..5044d9dde1083c5be109eae5b8426093a6a3abb1 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 825c8313996b37aa6e887839ef1cfabf43cbc4b5..bd798a6ee9bd7903e0a04da46032ca8bd9cf6b2e 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -7,13 +7,18 @@
         - 'autorelease-site-verify-{stream}'
 
     stream:
+    - carbon:
+        next-release-tag: Carbon
+        branch: 'master'
+        jdk: 'openjdk8'
+        integration-test: carbon
     - boron:
         next-release-tag: Boron
-        branch: 'master'
+        branch: 'stable/boron'
         jdk: 'openjdk8'
         integration-test: boron
     - beryllium:
-        next-release-tag: Beryllium-SR3
+        next-release-tag: Beryllium-SR4
         branch: 'stable/beryllium'
         jdk: 'openjdk7'
         integration-test: beryllium
@@ -24,3 +29,4 @@
         integration-test: stable-lithium
 
     project: 'releng/autorelease'
+    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch **/patches/*.log **/*.log project-reports/*.log'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 91fd19ca0ab4a4e97d08c0a76144bb86138ca24a..348432d0987dbd01df36586d40e60e3718a04fe7 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -75,8 +75,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -84,6 +82,8 @@
           condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -135,8 +135,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.log,project-reports/*.log'
     - email-ext:
         attachments: 'project-reports/*.log'
         recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
@@ -150,6 +148,8 @@
 
             Archive also available on Jenkins at $BUILD_URL
         always: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 ###
 ### Maven Sites

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 8d55be0bde5f9fda390d5751f0d17fc4abb16c75..536b29a7079f1916369d71a2d1953de599a95991 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index c7b89292a05da5661a5d3e3d00871f74f2b2db52..fd78b28d05d364cf50aaa37eebe16c96e2a38623 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 1c35df72e57e85cb73f8151b250b19ae70126e1a..94e867beacbb01d17bff4aba9d321ec70309f5e9 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml
index 2bda04a88743ee99f3c10cd3849d6990fe069ec4..551e0395dbad5324604b80ac135e3bf8dfefbe28 100644 (file)
--- a/jjb/bgpcep/bgpcep-pcepy.yaml
+++ b/jjb/bgpcep/bgpcep-pcepy.yaml
@@ -6,8 +6,10 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+        - boron:
+            branch: 'stable/boron'
         - beryllium:
             branch: 'stable/beryllium'
         - stable-lithium:

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 0a734bfa04107bf17557bf25d7ef307a0f4ad56f..7300bce14799ce02bc1c9d8a42da2e60439aeba6 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index 0b62e97a9d951f8865ebbb3022f53ada4e6757e9..d7f754c7f17bc946ca2cedcc1f386aa5256b635a 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 7da6caf1ffd477445ac91a65051c33d4cdd6e0e1..74c1e9366aab0982eb3bb0b85629e84167b2a5cf 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -11,9 +11,12 @@
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

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

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 0ac92e7e4b9616a0ca17d4d399c84258b83b8fd6..2cc5dc8251b46ab3d9a788a1c4c23dcc791e59f2 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 453dbffd10ba518b040eba64b5906c7c3ef007ea..e2b1932ce26a4516b10563923fefeadceb9e731e 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index cdcecae527c3cdd527b442dd9fe78d5558962231..6abc1f21236a8d2760a68f25d6f3ca7e5648d8fe 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index e9f1b4921d9b9e225b9294a588ac5383a09c44a3..edfbb7c48b188bc732b80954166cf11f324ba4a7 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -5,8 +5,10 @@
         - 'docs-verify-rtd-{stream}'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+        - boron:
+            branch: 'stable/boron'
         - beryllium:
             branch: 'stable/beryllium'
 

diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
index d9844866c4250678fea7643ec1455b3cc09e782c..9f7d2c65a3226afcf7e88bec43ae1663810c2271 100644 (file)
--- a/jjb/eman/eman-csit-model.yaml
+++ b/jjb/eman/eman-csit-model.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 107ab5ade8d53c79315d095022ce79ab6b0eea8e..6657f82c34b6c5f6f3c66d7f2d619970912bb6e5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -10,10 +10,14 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
             install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

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

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 245ce43bb13156b279275b6127bd707a02ddefad..2833c06092a4f0e604d3a698ca4ad0188adc8513 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index c2acf2b51e26c381435c6fb829dc3606ac109cf9..745e7ff0645bd44ffb30cf4d1982a22a4afa4ebf 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     # TODO: Add Beryllium when everything is backported there.
 

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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 9887ad023f0bf3fa1ed9954bcb867cac1ee4da1a..e4f98bb49184360bd6c6aeaf241c7b9d5a4f9806 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,10 +11,65 @@
     project-name: integration-test
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             jre: 'openjdk8'
+            csit-list: >
+                integration-distribution-deploy-{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},
+                nemo-csit-1node-engine-all-{stream},
+                nemo-csit-1node-engine-only-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream},
+                netvirt-csit-1node-openstack-basic-all-{stream},
+                netvirt-csit-3node-clustering-only-{stream},
+                ocpplugin-csit-1node-get-only-{stream},
+                ocpplugin-csit-1node-get-all-{stream},
+                ocpplugin-csit-1node-scalability-only-{stream},
+                ocpplugin-csit-1node-scalability-all-{stream},
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
+                packetcable-csit-1node-pcmm-only-{stream},
+                packetcable-csit-1node-pcmm-all-{stream},
+                sxp-csit-1node-basic-only-{stream},
+                sxp-csit-1node-filtering-all-{stream},
+                sxp-csit-1node-topology-only-{stream},
+                sxp-csit-1node-topology-all-{stream},
+                topoprocessing-csit-1node-topology-operations-all-{stream},
+                topoprocessing-csit-1node-topology-operations-only-{stream},
+                tsdr-csit-1node-cassandra-datastore-only-{stream},
+                tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hsqldb-datastore-only-{stream},
+                tsdr-csit-1node-cassandra-datastore-all-{stream},
+                tsdr-csit-1node-hbase-datastore-all-{stream},
+                tsdr-csit-1node-hsqldb-datastore-all-{stream},
+                usc-csit-1node-channel-only-{stream},
+                usc-csit-1node-channel-all-{stream},
+                usc-csit-1node-tcp-only-{stream},
+                usc-csit-1node-tcp-all-{stream},
+                vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream},
+                vtn-csit-1node-coordinator-only-{stream}
+
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            jre: 'openjdk8'
             csit-list: >
                 integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index c7dfdc4faa98736e66c607ab3db74dc83ff7fa78..36d0ed742ed5b3566b84b2727d44e0f8b06b593e 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 70c60fc7a5fc2bb19cb18885372e1c7c98b3b429..571843202e45f29bfec3eb962df08a4f80300169 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 4382b6b42fc945475c3acd3ded3f71c05955ad10..131fbea00c139fe251b9f035a4bf936bad1525b5 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 970751c70cbcb1fecca5056af9c562a5595a2c01..2e8bbd71f8b6c4749c894f32c7f561815349b8e4 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 1d3d1302b74e4e0a02b055644c95d20a1d4bc33b..c2e1c4b507ae78e4e81f8b8b8b32e2a19a61945c 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 1c8d6a142f8e03858a03e6231fd7b5cb86fb7b57..162b0ff0610b555a66a91fccbfb508e465170ce3 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index c76676d0a80afea951fc12ecfa95368deefd981c..5efc332b63464be45a1c7e5e88016afac7df87cc 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk8'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 278c23e816ffca0e82f02f874ba21a54bf22fd30..5335da9244f2ad98cb659ca0964b3a22cdb72d7a 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -11,10 +11,14 @@
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
             robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+            robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
         - beryllium:
             branch: 'stable/beryllium'

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
index 8d27a9ffd023c3a4bc6bd21f9254e7757e96016c..948b809ce1a03e4d2fbaedc4c3626f254ea11b5b 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-dsbenchmark'
+    install-features: 'odl-restconf,odl-mdsal-benchmark'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index 91858970f7442f6a5d976169ecd829ec1c70209f..f2a3357df939c9a56caee14b734d4c191e9d7065 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
index 72620136baec7c934a705a1bfe571a1b5cb2ee4d..a6d246f91f7acfa1e9b0450418731415040e1b5e 100644 (file)
--- a/jjb/natapp/natapp-csit-basic.yaml
+++ b/jjb/natapp/natapp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -30,4 +33,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowplugin-distribution-{stream},natapp-distribution-{stream}'
-

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

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 74528bd06a3358da14cf9853ea31822ac6bd9ad6..751ee7024f60e6d3c3cd7e604ef9365d1d0a4cfd 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index de0d01ad9f79b87d74d7444822e575849dbf6804..dc8aa3d06a8517599f985161f5ba051515f1a193 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 48cb63b9bb38e73815d9740f95eaaea5039b8737..b1f9b481972ba1545bc61b9775a84d6a77a7631d 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 77692ee60c6c75503c4d58e120ad1a2d2a27e44f..93f1cdb6be2129b4f4a37462497b22de98b5adea 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index d347c0dd2bbadf75cb793efd3f058e1457117659..436170333515e4ca84b58eda1b1b1f301269101e 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index a2f96288fb3dbcd81c4508a9bb7ed981befb6a4b..5927d2911cd2905e54e402cacb8cf87fbf7a3d34 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index f4a4d8d76b1790c876d2fd4ef4cbd9440df640d8..fc1c774a5b9ae1b4fd98fc4b1330b9c288525e50 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml
index d29217e854a94af78a704d943dde628d07ec6bb7..b5ce68817ac83e158d6be6243cd20dc9bca7bcb4 100644 (file)
--- a/jjb/netvirt/netvirt-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-csit.yaml
index d2f8c15cde9c41b5a9eba4a0fe7121885e02e2b0..51c0a5648f3d6b09a856baade29309d1add3e8f7 100644 (file)
--- a/jjb/netvirt/netvirt-csit.yaml
+++ b/jjb/netvirt/netvirt-csit.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index 53cf4584a05c5e076727167059e98613b3d7a675..fac01da37e52b21a709e22992bff8e5611e7e92b 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     openstack:
         - mitaka:

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
index f06abf401da04f189898117b5336b18699960b6d..876f099939a2972e28da64124027ade623ce53cc 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     openstack:
         - mitaka:

diff --git a/jjb/netvirt/netvirt-vpnservice-patch-test.yaml b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml
index 4e9b6fecc28e8e9ae885d4e23c3f1a25b0d2e2b1..b5b2df7f9d969779724ff4ba2ec39ce1dc6b8692 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-patch-test.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-patch-test.yaml
@@ -8,8 +8,14 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             csit-list: >
                 netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream}
+
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            csit-list: >
+                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream}

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index d595e54dc38657a455ae417c737adfa4c48b1b19..636fe17879588ccb429125cfb34d158dfec58a2c 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 30697dab837488a05993bf9afe94f5751080d8ba..79855c405bff29d9cc2352d0b4379dbe75b7b45c 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index a7c1e96a17411c92bb1a78b3518563c7963737cc..0d00827bc6de337005b35667dbe216865dcac2c2 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index f37713bbcf74dcf0c217ebdf9748bb22e5996276..12644994da9a9d85349b321049043c2aa7d73106 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index 7a795ec76c8b087a68a1743c5e5792d7d36ca8a1..acad73675eee59c1d2922869948ccd4b926cc742 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
index 6ddada5eb6eabaddda470b62e9b5cd0262c0199a..42ff20a73c6acb9ff616d8b01cba2e2f98b0ab9a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
index 1286a3b41774792c5d13c649d3eb597399d49ba6..edd6e4b9ee1f6764e8dc361f769439d6ca136dda 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
index 26769765dc5083eaa3c99ab61a3b19e933d077cb..9b80fb5623eb9db98b5efff919f0e8b564248f71 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -30,4 +33,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
index 6d3308c75609b93c2b62b2e87771670e081d38df..6ee46aa96a47f67cd182bc79dbf4408273db1a15 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -30,4 +33,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
index 2f9275f3583715409a9175720b82c97de739b51f..6468a1b3ba6647acd7b313aa4fd957299d4ee086 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index e3ab2cc510eb80370053c0b1ef265502d0145c21..3260786da724c64e592878e43e20b80043682018 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
index 7185b67ffa165ac5df5f56105d5f28afa41469a8..1d76820be5f58b0f52520d53a931420fcdf6f1ee 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index ff8bd6570b38387e2b8db9127c44bf9b44b5c301..18840b86139f962110cd78bc76e51ee947d2c347 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
index 23803830bb4b0acc8038e3c669a1ad363de50b79..2f1fe1307b5c5481baa0acb84d1c892fea1a7ba3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -27,4 +30,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 2947c75cb4623db8fabab7e3b95a0265acf56bdf..928beb429f84a99cc4e2628b58fe9e73f23bd0fd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -27,4 +30,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
index ccd1dd4b2ce3eb88693de259e7c92c6185692c1d..a969e9ab8e16566b81ef27451458dfe43c8b2acf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -37,4 +40,3 @@
     02-plot-yaxis: 'seconds'
     02-plot-group: 'Stats Collect Performance'
     02-plot-data-file: 'times.csv'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 3a9152863bd8694a35abae304ab00412e8532106..c24df399ed46cb9a0b94355ed683a5a51616a4b1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -37,4 +40,3 @@
     02-plot-yaxis: 'seconds'
     02-plot-group: 'Stats Collect Performance'
     02-plot-data-file: 'times.csv'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
index 6205911fc51ef7002c64cde724c18ef2a96fd6be..832afd7b0805307dbf2220c08c42473c5c55acf7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index f7ceab26266849c36c96386b093d0a2a630159fc..212d3aa15a283c649b6083c591c2c39125009bac 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
index ad4dc476ff7de23551b5cab273695f7f1cdfeb86..0e39cbec8602c123ec6a099e8b8829b2cfe2b8f1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 6181bb0e35d5024ea5f1048460d7bbd847d2e2d3..b9b9f3475effc32c1b9f10760b998c835c94f415 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
index 24a8ca1158c6225e863a020795e5b20eb48f0aa3..449a37fb44892bb2a51dfd49ba16f71db2f8b8a3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 38582d2d04ec26e1ce8f4345a4db15382537fd76..c34ee5be818bd5848139f43e5919b985fa063e04 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
index d3d4760fcc5b365f3f7640611f6af942b5436350..d904beb3af017b3ace74d5fc4ad3302f1c835c9b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
index d43ce8c15c2a8cb70be8130c176260ac10a533ad..1fd2c9ab0d26cf90ad4895f532d96007a04943af 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
index f3021cfac11005e22b37c383de10209e01c5314c..ad4504ca03ae63b5fe42e2aa39a951ee93414024 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 1e04849cadde4c74172b80f18bcc788776aab33f..32819da6a27b5f26574ed0266b38099bd4c4fce2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
index 42bc8d4d922f411e89f87cd461e4970dc09cf207..6b4b7abcbfcf74977b8f0f46745964f9001f46bf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 1b6dd8ca6fe5344c6344a942820093d88dfa5d4a..9e31b0a3fc7c873ddd3b5dfcb1967bf5631700d7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
index 065e76f7dc6e7ad8822e7a12db7b9d3f7d334ce5..dd00f65111c065bfe63bd7ad591e10abbb2be637 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 2f27eb0a5e80ebbf95c4351c324207e1a6d4bade..033fe811bb2df7e68b570a3e36fa345a8de6b79e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
index 5e7e28fc7de03234e9169478b8ccd1d32e9cfb0a..a4013091b12afe282cf2d281106fe2eb548872eb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index b09c59a735ed22dc1b72433a965503c8a8f60a28..40d609c08d71602396528093b82b4c3750869b6c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 9672802f22e5261270fee81275f7ccbcd0b297a3..b1d2c10d25a29274171d73d8b9c03dfdf9b6a03e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -8,7 +8,7 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             csit-list: >
@@ -24,6 +24,22 @@
                 openflowplugin-csit-3node-clustering-only-{stream},
                 openflowplugin-csit-3node-clustering-helium-redesign-only-{stream}
 
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            csit-list: >
+                openflowplugin-csit-1node-flow-services-only-{stream},
+                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-all-{stream},
+                openflowplugin-csit-1node-scalability-only-{stream},
+                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-only-{stream},
+                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream},
+                openflowplugin-csit-3node-clustering-only-{stream},
+                openflowplugin-csit-3node-clustering-helium-redesign-only-{stream}
+
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
@@ -39,4 +55,3 @@
                 openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-3node-clustering-only-{stream},
                 openflowplugin-csit-3node-clustering-lithium-redesign-only-{stream}
-

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index e6aac723b050a0ab60f011e6c384d527098d466a..9282deddc588617a7f20b1123f7e5fedb5c14a8f 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index 54ce4ded5a6c4b439e7a7d59c9a8a58a7b518651..9cfc0c3a8eeef921ae139cceac756b49a72d8212 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index c4f588bc7a05a083e8a0999542c145459b404560..f3f999a36469e1e772231e90d5d726fb963dbef8 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index b625a322afbf6d51166b08270f898a54d6b5f219..ab61658c3586f906a7a5426d0ff2d555a3c12508 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -8,7 +8,7 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             csit-list: >
@@ -16,10 +16,26 @@
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-3node-clustering-only-{stream}
 
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            csit-list: >
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-3node-clustering-only-{stream}
+
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            csit-list: >
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-3node-clustering-only-{stream}
+
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
             csit-list: >
                 ovsdb-csit-1node-southbound-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-3node-clustering-only-{stream}
\ No newline at end of file
+                ovsdb-csit-3node-clustering-only-{stream}

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 6ebd11f6bdd4a18e8ee214422bbd7285ce803e1f..357cbbb1aba7b5c2e675f0621f84b708fae89694 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index fd6060a790d97437534691da8a376f640c3a582a..6d3a8ca6ed526eba373831f10f87c673690f340c 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -33,7 +33,7 @@
 
     # CSIT images configuration
     controller-image: 'centos7-java-builder-2c-4g'
-    openstack-image: 'centos7-devstack-2c-4g'
+    openstack-image: 'centos7-devstack-2c-8g'
     mininet-image: 'ubuntu-trusty-mininet-2c-2g'
     mininet-vms: 1
 

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f4bb10dad3da73ce03dfe5646cf0bae8d56bf703..22e741a216e232f7382b6c27ba34e68303f6949a 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -540,7 +540,7 @@
     name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
@@ -607,7 +607,7 @@
                     - compare-type: ANT
                       pattern: '**/*.xml'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
@@ -616,25 +616,21 @@
             pom: validate-pom.xml
             goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
-            - '-Xmx8g'
+              - '-Xmx8g'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: 'autorelease-settings'
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
         - autorelease-sys-stats
 
     publishers:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 2c27cc4a33b742546f06230fe4826d4c45041265..26794a1da52ad04c128681596ac3c8eb5f43c6d2 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
index 63857fd08b74635d3218d788dfe64cbb67abe22e..a5694ea5df3be38d18ccb29fdca4b321f778387d 100644 (file)
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ b/jjb/sfc/sfc-csit-clustering.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index d971eccca1379a4188aa87834949604d4127db2b..039238c5c0072f620f5ae0af958247748552f45f 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index 6bf6c0942c366a5f64e16964bb70076a454fb7c6..d776758d2e9ea7c9c1a67d17dad5b87b6575580b 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 25ab3402eec8fd04b14fbb28019fa0bedeecb9af..6894c7a53a71a1feb4b79fbc5b12822fa843f9ba 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -4,6 +4,7 @@
         - '{project-name}-merge-rtd-{stream}'
         - '{project-name}-verify-node-{stream}'
         - '{project-name}-verify-python-{stream}'
+        - 'spectrometer-deploy-webapp-master'
 
     stream:
         - master:
@@ -14,4 +15,89 @@
     rtdproject: 'opendaylight-spectrometer'
     toxdir: server
     nodedir: web
-    nodever: 4.4.5
+    nodever: 4.4.6
+    staging-server: spectrometer03.dfw.opendaylight.org
+
+- job-template:
+    name: 'spectrometer-deploy-webapp-master'
+
+    project-type: freestyle
+    node: dynamic_verify
+    concurrent: false
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - 'spectrometer-deploy-key'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: 'spectrometer'
+            branch: 'master'
+
+    builders:
+        - shell: |
+            echo "Deploying spectrometer"
+            ssh -oStrictHostKeyChecking=no spectrometer@{staging-server} 'bash -s' << EOF
+
+            if [ -e spectrometer ]; then
+                cd spectrometer
+                git pull
+                cd ..
+            else
+                git clone https://git.opendaylight.org/gerrit/spectrometer
+            fi
+
+            echo "---> Setup Python"
+            if [ -e venv-python34/bin/activate ]; then
+                echo "---> Updating Python dependencies"
+            else
+                echo "---> virtualenv not found. Setting up new virtualenv."
+                pyvenv venv-python34
+                pip install -e spectrometer/server
+            fi
+            source venv-python34/bin/activate
+            pip install --upgrade -r spectrometer/server/requirements.txt
+            pip install --upgrade nodeenv
+            pip freeze
+
+            echo "---> Setup NodeJS"
+            if [ -e venv-nodejs/bin/activate ]; then
+                echo "---> Updating NodeJS dependencies"
+            else
+                echo "---> nodeenv not found. Setting up new nodeenv"
+                nodeenv --node={nodever} --prebuilt venv-nodejs
+            fi
+            source venv-nodejs/bin/activate
+            npm install -g spectrometer/web
+            node -v
+            npm -v
+
+            echo "---> Ensure mongo is running"
+            ps -A | grep -q '[m]ongod'
+            if [ ! "$?" -eq "0" ]; then
+                echo "The mongod server DOWN", restarting...
+                if [ ! -d mongo ]; then
+                    mkdir mongo
+                fi
+                echo "---> Starting mongo"
+                mongod --dbpath ~/mongo &
+            fi
+
+            echo "---> Restart spectrometer-api"
+            pkill gunicorn
+            sleep 5  # Sleep 5 seconds for cooldown
+            nohup gunicorn -b 0.0.0.0:5000 'spectrometer:run_app()' --timeout 600 -k gevent >> ~/gunicorn.out &
+
+            echo "---> Restart spectrometer-web"
+            pkill node
+            sleep 5  # Sleep 5 seconds for cooldown
+            cd spectrometer/web
+            nohup npm start >> ~/node.out &
+
+            EOF

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 1826098656e24e802ddf4b9e3e160541dc5966e1..e184c6b646c22218f60372e60c926db615ce8334 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

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

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index ee8714bd060bec2e04975904bee8dc11b615f69b..3156356791ccf95cd1bf5993e2cce557aad92ece 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -11,9 +11,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 0723848d78f25fa8bb303da6d13d75e5a3901d09..759b1c89700e9afe18058eb61d2e46893bf0a940 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 1ff5499979d528f81e4f922dbfb2f6896075439d..c8b2547ff957d9ba8b347aa5338bab78e216288e 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -22,6 +25,8 @@
     install:
         - only:
             scope: 'only'
+        - all:
+            scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 35361aba13f77adf65136e056a01ac82a1a58e80..f348246a7d3c6438ddf613d7668a4ad51e68a9da 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -22,6 +25,8 @@
     install:
         - only:
             scope: 'only'
+        - all:
+            scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 0fb3385ea4cb5158ec768ba08d3556512cdf195c..63718986d3953ae42f279b9517c661176fa5cf56 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -22,6 +25,8 @@
     install:
         - only:
             scope: 'only'
+        - all:
+            scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 63137322dbdd2c542c466555d7a3a961a42d2569..8d7a7c70958bf35f9dbea3a17578e0652b8f1926 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -18,7 +18,6 @@
             disable_distribution_check: False
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/beryllium'
     branch: 'master'
     jdk: openjdk8
     jdks:
@@ -54,7 +53,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'
-    branch: 'master'
     jdk: openjdk8
     jdks:
         - openjdk8

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 15e2f44bf351e6d977301f53d0300048a22e142c..f92da132f9e7cb02b279c90b8a63fe5744c88220 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 3f207ef1c02ff6929894d90cfda9df918ca9ef02..723d998c173ee13b34a6e0d1abe647dff6f8fd07 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 8d21c1f64fea35552e48ab7e3b4926ac3b0ba90c..07251d07c9e71dd3e0327897a750b90fcbfbdf42 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/usc/usc-csit-udp.yaml b/jjb/usc/usc-csit-udp.yaml
new file mode 100644 (file)
index 0000000..088838e
--- /dev/null
+++ b/jjb/usc/usc-csit-udp.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: usc-csit-udp
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'usc'
+
+    # The functionality under test
+    functionality: 'udp'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-usc-channel-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index a611bead652c8194cc627bcd108bade72fd72451..910cbab58e6a7ffca1c2e4d2cc740f943bf9cb6d 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -33,4 +36,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowplugin-distribution-{stream},usecplugin-distribution-{stream}'
-

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index 753c57eedd1965b65ad22726be760cb8995d99af..b60525bb32aa34c3d41bc0220488ecb01c7bc1ac 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index fcb3b743f933fd91a22af2beb02ecd37bd7dddc1..6a7d86d79a0d64f2871e6f7ddb454b8e0777354d 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 70da3aa9d5f3879cec176e737a0f4c04478b3811..0daa0230e0d53ae5bce129268c8db87b0b6becf6 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 3248ac413b19ccbadd0e389de0115d252dc9489e..95c5058dd0e8971341ea352664e7f4e794182b9c 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 8f0409884635720521d03cee2e18af514a07d735..87f0a00b619b056300ab2c482c8e43fc6ae2c34a 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'neutron'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'