Make Java version for CSIT jobs configurable

+ Every csit job uses openjdk7, except boron which uses openjdk8.
+ Removed jdk field from verify-python jobs.
+ Dropped -beryllium from the mdsal-dsbenchmark job definition file name.
+ Made jenkins parameter to pass down to indivdual CSIT jobs from test-integration.

Change-Id: Iaab9020b7235a82cd1674b1d7af8f2f4ac9a4b8b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
index f1fe3275fc8289e2873292275b191dc2d55c11f9..5cf3172c8f7ac6f4aee49c2a1caf9456248c81a1 100644 (file)
--- a/jjb/aaa/aaa-csit-authn-stable-helium.yaml
+++ b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 9ef0c6a1af847f4f14bc1aa9cee368a0e288f00b..89d7fc764467162fc538f2c088d8e738021feb2e 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 18f0c0f99f619f163271fa200e6746bf665d3050..112d84365e43d9e5f3f98aca21862c768423b9b9 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 6e487344a406823709c86eed58ba4605070e30c0..202f3e4735480f8abb9518e85cabaa41ec819598 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index e91d6c105c50399c43ca8ee171c75398b2ca6dc7..2f24991e076c778c70a1f8a67db5e86867783f12 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index bf69777980e7e3b32ddc393618a68a4f5ab02224..e81d7975738d115c986ff65f47b51d41b8770a7b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index cfbc4180fd3c9c55e445fae656acbc7974550191..7f4edd090758fb5680af1755b5691c93d9177366 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 37033e5df96c022113324c19515eaa4667849443..09727d51ace61d25f3ea88e684b7ad9b5a277666 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-python.yaml b/jjb/bgpcep/bgpcep-python.yaml
index d4a2975749e20a84e2b6c2c4ee6224defabf7ce8..ae7627367019a64b19b565e85e03656a43eb13c7 100644 (file)
--- a/jjb/bgpcep/bgpcep-python.yaml
+++ b/jjb/bgpcep/bgpcep-python.yaml
@@ -14,7 +14,6 @@
             branch: 'stable/lithium'
 
     project: 'bgpcep'
-    jdk: 'openjdk7'
 
 - job-template:
     name: 'bgpcep-verify-python-{stream}'
@@ -30,7 +29,6 @@
     project-type: freestyle
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index bc56921cfe5ee6ce8e39ab2a606138943e1c876d..63e7fd08ddadfb24761a5fd7493d93831feb735e 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index b1151e72581c325d891c47bc4863cb2ea4172936..7ddc7c73cb527e7be9eaf510c536f99c33b56a40 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
index 26d8263091081ee5762299f437d04193d78524b9..04de420ba88d30e86b35e1e40ccd1dc5e8838706 100644 (file)
--- a/jjb/controller/controller-csit-clustering-lithium.yaml
+++ b/jjb/controller/controller-csit-clustering-lithium.yaml
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 9af7c48017f390ab2c054edbb644b10889b79131..92e9877016ec91c03ebc45a8f3482400666005e3 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-nsf-stable-helium.yaml b/jjb/controller/controller-csit-nsf-stable-helium.yaml
index e967bc7ac99b429c1bd6240d8e2ed61109814ee0..fac4513c9aceb7a69df893116b47a608367dbc89 100644 (file)
--- a/jjb/controller/controller-csit-nsf-stable-helium.yaml
+++ b/jjb/controller/controller-csit-nsf-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 49c1c4a500e8ab98590482b8e3285d3a4aec3caa..7e1dc271de0851a65e3fbb564af61e71c76eb566 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index 1bdcfcbca7e98298f231f188239e978d103b49d5..dc4d6b1d809a967784115f1793bd1a4330b2f5f8 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index c195151809d766276c7c50f851ed0266439a1e5d..da95b78c1281c6f9eeca1caeac4314cf7caa4dc8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index f330303b028f5e07e071a3c1937845b6bcc74a36..4f4f0ce79371590286aab9c670948796aa0bfd73 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index fc5c487348fbefdf5a373b3a47739bed090b34cb..1db1ccc183cf9c53fff1d18690ee42761035e1f6 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
index ba2b7410f16dba37db1aeaa7568c27b796983d41..7bd9c05e6fbb36a04cfbaeb7e8400fa4d967ac94 100644 (file)
--- a/jjb/integration/integration-csit-basic-stable-helium.yaml
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -15,6 +15,7 @@
     stream:
        - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index 432747921af24d23ef6ffa49c8d7e82547034176..266f9a5a2b04414a036bb886d0691850550394a2 100644 (file)
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -16,10 +16,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index c0914b445a39baa8939ae904094a4090b6c0825a..ed1676c7b5bbbf6af56b02accfb0a1f9096802bf 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -166,7 +166,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout
@@ -215,7 +215,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 888586cc3f8115dca637906561d585d94a08c68e..4426e6b290a010111ec728bfb608a535aee807a6 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,7 +56,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -136,7 +136,7 @@
         - integration-patch-refspec:
             branch: 'stable/helium'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -242,7 +242,8 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # Here {jdk} is taken from releng-defaults.yaml
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -322,7 +323,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -425,7 +426,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -524,7 +525,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -606,7 +607,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -711,7 +712,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 195876e682dbe82768d9b56f2b1133b957e5a30c..5464d411073671d7790f5215f5832348cd576b59 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,7 +11,7 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk7'
+            jdk: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -268,7 +268,8 @@
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # {jdk} is from releng-defaults
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -337,7 +338,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -349,6 +350,8 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
+                  JDKVERSION=$JDKVERSION
+
     publishers:
         - email-notification:
             email-prefix: '[integration]'

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 73253f7cb53b9954925e4c3dece409d909cb68b0..e530ddf8c7d7fc23cc8f2dd7500b74049d01263d 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 640d0bc39ae2a9537415734436cbb5151078d1e0..d1ddbc7fd9a7b547f1f4d63d65ce0d60095aad26 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index b951c8762b541131571a8235d08d34cda84b3e57..ce896a32916735f5faa6da00f588d2fd263533ba 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
index 4b3f58e263720fe78abc18454b238bdadc2af7b6..44cc627be56405bbcfb635da5a2e1b53fe584db4 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
+++ b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 56be3d3581cd4ade147580a4be29f4768f24d5b6..24a427082be83b7bd2bad737524e9ffc3370dfd1 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index e8f3fe526e6560f32992bdfb32c8c29dbd7a990f..19e18dc9a28bffdcda978b15821f309596b6b0a6 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
index b5b0891aee36bdc2e1ff14c072089fd2e7edf957..deca072b6b1d708f246e9d9e604ab77a59806504 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
index 7ab459a32e8aa051ed2ecdf908f46257299b6f75..c7b63adb767ff737e23506a764f8c4119f2b167d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index c0ef799b30f3179736cdccc72a0e1e11a7388cc7..d551524a02ead372e68f7dfbf22dba9170983029 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index d6a5e614da57eada8bdc6200a6d03b9a28516a01..d1e64856991d0e1b95f2dd40cc521eea444f14dc 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
index 61e3b8f6d1d531894cd1194ae937bf4ca1b37277..62a1b24e3192136797c7429791ca6875c66ddb29 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
similarity index 95%
rename from jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
rename to jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
index eb5a58aff34ef8311b138fe8427d979bdef66f83..4bce66285febffe41284968a3902bf76af584d53 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index 35b4800ec015085abf1f0ab004eed23d9f4cc9d2..ab00be3a6808b0bea4782cf0ec706d19f4db86b0 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 5540d97de029af2b0bda2b3f9040b116303b1957..f9c106af0933fc8ff6cb6c9eb686470c5af5d1df 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index ead3e74a35c3dc06b4a7c23c9b072eeeb7a62459..fb2e6e3b80d6a74c161e3ffa6ea34061eec0846d 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 314a2e150ab6e36eab9b94bfc5145032b7bba1eb..b43d413194cf21fba3b9b1cc23d04ae753164f1c 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 36b9ee9b00fd334a6434de1b2bd09cc8f13712ac..5a1b56d9fe4415e839afb78bae23c88670d1d249 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index a461eacc5d18a6e964cc0d8e4193a00e08d83cc5..7fc0dcdeb66fd2795f11e7a9027d5af215e15a2e 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index e98756894438f997e0784b361aa0b647c72320c3..8443e1c8ddf9382fd31fc4bcd267948a9e044258 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index a437bacd0a8d9544aa9fd5d8b732f61c6e7349b6..4123c4a7737353de4b8154d2b804206ed1f22b9c 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

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 5fae0edd86f20a503dadb805ade6f80119239e35..ccbf77b3970fd3ae55a7b9956d94ef0540467fc8 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
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     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 e76dacc4cce233dda15e9bc49f1160ddde8b985a..45b6ad532b1e191dff42d9856a7f047100227fa2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index 8b21e0a7fcbb4f2e80074f9e2b53b40d00c567b3..fa73ce67ba97d334db2ef3fc3a18cb538e209d8f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
index ef8109471191fa60fe8a257f03827e2a9f53d562..0e525eaaaad19356d239a9d7f8aaa87e722d74f4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index 7afd5d1867635bf4bea8c0520044951037ed109a..e5a0393b60efb44142a1b2523aad85de8e732e5c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 289bffdffe41719e0760e2808affd2a5d38bf54b..509838154894264ab2ba0bcda3e4fb6d15a61e51 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
index d4c8f204e1127bc7ca1f232422417b70502103e9..5322ec2b64fb003d97d974ab548030ec328a46e9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 8ee3b185ad251bd8a5211f51c9f11f238b1e3c12..ae62159e5c09b0916660fed5ea019ed852e145d7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     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 4bd1b7f64f0cf331938a49f69739844f3e9ca06f..1c3381a156de7d421f28665bc8471687452fb4e6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
index 58a5c711e82ad6e873c99e0082c6c64b235af4a6..2886a540ea5e5fa616f7b3d56742b69ba62a928b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
index d712cf48f2a52c5bcbe5afb9023b07d4782869e8..513c76f8f98e3377094c6a925a4eaa067d5ffa8c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index d311dc6f6d7432cd05180e71a53c5e88efec3952..0e8baca8afbd16215a15a6e7108df9fb172c9a13 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

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 5e251b1c03ecae1ec9d96f86b9a1301fb846383d..9fedb2b4b4df8988109cd567072549b4780cd39d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 299e599b37cab4cedd00eabc1f31b92c4ee8c67a..3688f2302e1155e0e3146abcaa7bb2dcd7086f4f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
index beef22f7945ce35076a5754a57c4314b59d50a36..32eca642ef06edb56829285b67bdf8cb26b70fbc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index f2ce6f9d506d5586bad7a4a92604118c08ec334b..074efdeb92c449d4ca938720b2a3908695666d1d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     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 73f609130a2832610b5a53c534b42de5ccfdc66e..de887394381a0cfeb04e1648ba5733d61668a451 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
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     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 f86eca21ef4cd086c49fa43d8f2ddfb419fc3826..10ffcb19cfb7bdad2465c26126106f2483eb63dc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
index 534af2ac7e2261a8a25f9830505c7cd6fd54d608..82fb0c5be92d00cc380cd9421c2541f9421a1985 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index fedd2c30e39cd6f613db3c07074ad96a2960247a..74a9d79a0f8ffdba0fd11bab1322e1f496039f3e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
index e14a6f73191676fb2e5fda01185ae87716d65007..48afc44a27cd197dd7cd1ee0c016d41bb545a972 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index e98cfbc348feaee9ee5cba8c1868a7ae51777b05..c3fa7821afbd8360a22e842c3b5adad124907b32 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

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 9598ce0b1fe4d8faa0ee49689103f04af6c69fcf..40fa620d116e4aac2b0d8953772b5e136e133f00 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
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     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 eee00221e006eaa2ea557b9feb453ecba9dbf54b..239e8d3de3139b4a402364f4b90bc2d248dbea2f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
index 4ca8ded163d84081605b90d5866bcbad479dfeb6..6b6a4908a4bccbc7823a2db16d34f03e8e3c5a18 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     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 ad95d3698adea6a926626d28929b17743bce4a2f..544a489c1c2841fab416db79a6b4fecebf30f4ef 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index d7aa3a9c76a152a0830149e1ba263fcd50e983ee..9ee8ba8bc033f506f67cdf2651f01c98683113c0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 4b941192c067bd96d05387d7ae3f954eaec47342..545dc87b36080d2b5804fc7c35285f5a9d888a51 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
index 811c551f0cbfc0a00cb38472fd1f96236ca63fe5..2ccc23a874a56df59b8e55da2f9c7d0b072782a9 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml
+++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index ea17f351bf82913dab24a1cc289073ea959828e6..32f8ce502c6a0cb9e5284da6cbaa145c0b1c1fbe 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index aea82e45d4da1e732ab2251faaeacf89ce0c135d..f10e419c15fbbd2160cc4f71095d654b6b20aa85 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
index 08faf851231e374bee3053a68242e992948d3d96..432986711b5985fe8f98ba60a904aebefb3f5ad6 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 32307839697fa8a5b4dd74e0ec69540dc8dad17b..f9185b98a1102cf64c11ac03808c4894ade6e219 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 8349d067e5c526d8460f6e3ddbf351b1582418f3..4d4861c76561d01ce748ec534d3e5a0306bab1f7 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -101,3 +101,6 @@
     mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 1
     mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+
+    # In case a CSIT job is merged without Java version specified
+    jdk: 'openjdk8'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index d29af4fa47cf8258e293d5fcd1a136acbe3f8817..8823844c915c08a15c40cbcc56ad1d79ea81af1c 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
index 36514ba602040740027671a820f5a8118c590cf9..69d0a40a373f2d91d2fab46272457fe90ebe23a0 100644 (file)
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ b/jjb/sfc/sfc-csit-clustering.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 88ac908f8c141bbf6e58a900ff72ff96555fd5ec..50ba94e6678cbef2e9935fa95e1a0cba89bade6d 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -12,7 +12,6 @@
             branch: 'stable/beryllium'
 
     project: 'sfc'
-    jdk: 'openjdk7'
 
 - job-template:
     name: 'sfc-verify-python-{stream}'
@@ -28,7 +27,6 @@
     project-type: freestyle
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index 41eb2f79fb3ec5dd3b47ec68374daeccd0f065ed..a54979c5881b63ac0c4d376bf0cfed5b6a6e78eb 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 01db60f5b509c56fe91e802230958801b6b383e3..e616ddd3c64bf45a10fde567b2da3be7815050b9 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index b84c79784c87f277db70468333bb60694f5e524e..a7b5dbfb8f901aa2e5e410c932d83cf97bb055a0 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 92b68fffac680fd9738c3f732a8e437574ad55e6..8ec3d3b75baaa09945f276b49270ccbfb0304e35 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 81e17c8166d7d36f0a2ff496f66eb6d1a4e284ba..6b353588f00bb5b20a76c5eb02700b5ce7c4005a 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 148ce772f0a5d8c0a8103e77b7208ce0b8a16af9..dcf7e5efbbcd118c7ed4834000545b028db405c2 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index e2f1c0720e67c560bc9da623c8336cabf2d79d34..432966ae11786a35d799e12afa97db9a961d41f8 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 10e2c19a269ec298bb90aa6e08659ca401902f61..e23f0913fad6b40a093ee952a2872422104739a1 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 20d50101be07f0c393c733e59c56bec49cc2b89f..107b570df29b3b6e5a50573f3b9429d0c4ae492c 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index a16717a2b7131f28c8bcf13855340e73a7f40e72..d0fb0133d364b67fec6f0d0579e180b7be6811a9 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index 8f80816ef12794c767c5181827ceb9fe9246faa5..ffd980747a35bb1aabc51d3af8fb554438469b97 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 1be13bdda901fed60f98f4373af5e1135d92a454..1b2d27523cddc142472985f5c9d60c5f688b7224 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -14,10 +14,13 @@
     stream:
 #        - boron:
 #            branch: 'master'
+#            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager-stable-helium.yaml b/jjb/vtn/vtn-csit-manager-stable-helium.yaml
index 0691c320e478c6da56dd96b067ca53d269b43ae7..6e64e6651eb2d30e00f3b53c5bdb8ca6c3c7c572 100644 (file)
--- a/jjb/vtn/vtn-csit-manager-stable-helium.yaml
+++ b/jjb/vtn/vtn-csit-manager-stable-helium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
index 2f149ee613735c81b345d5ad5b516b081b08dbd9..ee6b0499495751e6694683918e6370570fa1f1a9 100644 (file)
--- a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
+++ b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
@@ -14,6 +14,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index c9a5716ef4d790eb95a6e6bd9510a76d1f1c6049..95b4a9039e546f96ec70b56fea36ecb1a96b3e1a 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only: