Do not specify jre or jdk if default value applies

This drop multiple lines which set openjdk8 as jre or jdk,
similarly to ho karaf-version is not specified if karaf4 is to be used.

Only Persistence project uses openjdk7.

Lines setting jdks and maven cannot be dropped,
as they constitute part of job name.
Similarly to scope for CSIT.

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

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 29feb59f170f0a8fecb2519623ccce8694e95145..8b5bec7c4750b5b20524b6e521f80de0a86ce689 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 9534251ba9a49c1782cd95f72f7e2e7e65f34763..c579f22a999c3ad9918f4d4285fd277693455f57 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index 5473951dd4d80190faa56874d29b53771955bbcc..5bd1c3fd68e173ecad57ada1183e68e1e326524b 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 2a1569b293040d5163e6c4dc786cfdaf0088804a..9e560e3cc26ed0eb8f91bb1d77189de5b1d8fbef 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 9f9560f80e91ff5faf185967f681fbad277e3db0..b826a5e39021bd60d235668d67217e58d974ba1b 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -11,13 +11,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4885ca31fb2f3b1f8a9f678227e78f78549e251d..49980f6e02e401ed66bf5dc230f068fde51adaea 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -12,7 +12,6 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'aaa'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 816563a8bb8fa1bae9386ad24635c77c6e6301a3..03d08d4404ac37ed191dd09b73ce064f6fc4c5ff 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 57f7b14538185e2fc40bafd5e9d7085fbeada0ee..ad6eb69cd91d4961729ab6c6473f5ad66fdfe969 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -12,7 +12,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'alto'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 03004a9e32e3fdc835c70bc38630dc84c3b0a30b..572547004d92b4e46a3f4ca939552584e43ecda3 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -12,7 +12,6 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 8d8cff7fd370205881a5532ea0169cc3b347e5d6..f7b32580149245508ade9d44d17034b91b1b9719 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -16,13 +16,11 @@
       - oxygen:
           next-release-tag: '{stream}'
           branch: 'master'
-          jdk: 'openjdk8'
           integration-test: oxygen
           extra-mvn-opts: -Dsft.heap.max=4g
       - nitrogen:
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
           integration-test: nitrogen
           extra-mvn-opts: -Dsft.heap.max=4g
       - carbon:
@@ -30,7 +28,6 @@
           cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           integration-test: carbon
           karaf-version: karaf3
           extra-mvn-opts: -Dskip.karaf4.featureTest=true

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index bdec61e8c2ebd8838d88dcf1cad1d65774e42188..5af2e07282fa73a1c5f180a1ef5db0f6b9cb1be8 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 83e4488918f92067d674ce543d3d3f0a0825cbea..6d6190a2718b4607fe0a4cfda6de08c1f68cc814 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 3e33e7bf7ccf86ab40a19b22296636d0bdb9563b..baad20af43cc5b0829c07966899df5fb917a6376 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 3a8a0d17bf2fee26fc0d404e3cd6ef65918d9179..b87c972975b38eeef81fe0db1e4667df1015208c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index da267c02d3b90137185037e4be65a9f3775e09c9..d09bd4ce5f8bb2e7f5796b37fa108c649468ef2a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 3b5691e791f41c33ee4e64c0c3f85e1632f4bcd1..cf2a2bbeb1a3f7e04146f428bef1ac7e1f8d3955 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index 93dacfe8a38586ed8962ab55631fd3562b117bf6..3126ddf61bbd2e9e83266386e5b0d058017c4e43 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index a4aa6f86a73926c5eb5097af664b8ee511ff7b4f..a2c559d2cd1e9392c57deedff7e964537739c4cb 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 693849af2877289d9061776a6565555ff036e5f8..8f94c0174f8a3615cbf006f02eb2058cae13ac45 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -17,13 +17,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index f308d8b0cb01accc33b5585537943c4c1dd9e0f6..1670dcd91b2abb3aedaf23c65d300ee1dfc4b49a 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -11,13 +11,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 16d8dcb65c19ad9c8e830435064de90822e7cffc..86903309b951b8bb5655c2af503f265f62d52285 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -13,7 +13,6 @@
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -45,7 +44,6 @@
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,7 +76,6 @@
     build-node: centos7-java-builder-4c-8g
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 322452d9dcbdf02c9ed4168a5dc7b20656d078b4..b59c343d9bcb73046523e288b7ee0143650e3085 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -19,13 +19,10 @@
       # Nitrogen if needed.
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: 'karaf3'
 
     verify-stream: 'nitrogen'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index c29d5a2d21209a50234cfe340586f252b46adf2d..950a32e66edf85236e3c2f68cffb341f57a83e38 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -12,7 +12,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'bier'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 938798744298b8edc9349108a6cfdd794e5e44ac..8d1038ce8b633107c74a02d05b37d808da73d7d9 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 2e7a81e0632a18da1cb4fb1e8b7c2dc034633cde..768db6fbd8599feba4c4b32c930bd9d868106511 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -12,7 +12,6 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'capwap'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 29610f47fd941f8c126c512c67a300b3e960844d..16e151fd39d0566fda95dc960aeb26d097258caa 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -12,7 +12,6 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'cardinal'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index c1c29d3a57fc51fe70b204dbee06e84dcafd92e9..6d783e50808593f7c84292a121538e54123afd22 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 395edf0b8130b7651b044289cb063feea9aed340..ea5576d16df58ac94c308600169d41758da6f7b2 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -12,7 +12,6 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'centinel'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
index 76d8173b0cc0337b598e85989e63cac217d9321a..eec7462b033d0dca109598b155004b3dfd05799e 100644 (file)
--- a/jjb/coe/coe-csit-openstack.yaml
+++ b/jjb/coe/coe-csit-openstack.yaml
@@ -25,10 +25,8 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
 
     openstack:
       - ocata:

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index be499099bb963b28f310be83d8a0512ca2d2ba8e..81c4fc7ff63ca6ae71c1bbfd1ac632566a79df1e 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -12,7 +12,6 @@
     project-name: 'coe'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project-name: 'coe'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -64,7 +62,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 203bc1c8c5762e90bbda1a249904c6a630602ce3..f6f3e2af740074ca9c024bade8515a35744eaa16 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -13,13 +13,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 6a0fd9205823945c1604b8853cefab44c4f9d726..612250df583bf3e2ecfd178b727be84cfb20b41d 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 22536d91ce638f87a5fc808ed44a63a54afcb39a..353fadb4806ed5e1ef2f7d113704fd74d40da619 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 203c29355d18ce29ca043efe962096f803619ddc..5e1baa3bd257090d81da8a27d74feff000a2147a 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 2ae01632a5ab377eb5d2d5caa0fb800d9781a252..226d14b99f01a9c9b8b19bfe42015cb27526022b 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index 1a3a82aaf8fa436eba0d3bb1588d6317d9a7db04..c251b410c220bfaa7637ad8ca6e195cfb01b179e 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index e5921207841faba19df83b89ba263df21b03c31a..f6e79b740fc6157876a470065096a94d7b8efdc6 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 8dc65e547b120ca51773a832d31e26a57867e28d..798248543380fa1cb13fa001e4988eae2ca4e1c1 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index f0b6656cb2c98a0fe320870090444d441786b8d7..aab5238c1d28dba1cb8f65907d66288d07e32aeb 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 75d2a927bc2bcbeeb46222844528815eb9d4b8c2..4b47661a53cfc30239b07231d93246753bc838c4 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index dd4a2256c1e830c77c89f95a53c3982ca4901b46..a30f5562cfc981d986b7f5f2497a0843255375c3 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index a5769964d40859c99d6e6907886c80ee347c1695..8eaebd644cb90ad265a7a46fab593646469d891f 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index a9674af64498e2f6949a45f5d5a50f372cce56f1..595df4a19d72a8e616e77ebaa6ae7013c6f91871 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -12,7 +12,6 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'controller'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 87d57d208b8c09c2f9f253c1b86cebe6313c96f0..cc66623c48c083191a3153da1a2c2ad39fb6f551 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -11,7 +11,6 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     project-name: 'coretutorials'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 01d90ecb296dc57f12722538159bd6d80017be45..6da14a22a9738220a4ffb1243dceb4d0e391dd9e 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -14,10 +14,8 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
 
     install:
       - only:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index d9db87ebdd95e24ae50419e65ebe4774e4fb55d0..a3ceedfccee3e477e8a4095077439354a7d81a86 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -12,7 +12,6 @@
     project-name: 'daexim'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project-name: 'daexim'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index d10ab897d5337ceaaf9f37df0f65552f093dd4fc..4f9e5c3cbd34eb7c935745a62e774ba10ad62267 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index a9d2bb573de598f9cb59ade8ea3417cb3543443c..833b5fa1e2ce30af8fdbb00686c3a2c499019670 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -12,7 +12,6 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'didm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 3a1a73e00a703dd50cb1b2fdee52fa09f9fefbe7..91dbc7e6002c55b636526a162ad1d1a1480ee21a 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -12,7 +12,6 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'dlux'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 32bea4c50120a25fc628e47af69d71f39672b30d..cbd02da9b522048114f1f4e804f367ec7c707ca0 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index c80512cf34e7747d403b82d5552ec4457f59942e..18aeec376b983b697915f6e5a62ceb5226f62799 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -12,7 +12,6 @@
     project-name: 'dluxapps'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project-name: 'dluxapps'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 63a73ccbf19905617e4c605e8ea304608a845aec..416c21d1e8d3dc52cd6783b6aa8efaba6596e0e7 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -12,7 +12,6 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'eman'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index f9e4ddfd2d65e4b89aea2c189198ff8593dd8694..054845c86fc461e283ecaf2bed8993e8627aaef0 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -12,7 +12,6 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'faas'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 305192f6645f018b4df5d9f97d756704d3c93fc7..170b0a4129b65937b2b0117b55e28c8c79acee67 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -12,7 +12,6 @@
     project-name: 'federation'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project-name: 'federation'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 863f802e3277ee1aafd9c9f6672f3fad5710615b..d6b35c2788ba81b711db2fa292747cd1b7137dea 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -20,13 +20,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index b9b4197bdf7be156647aaf9d2875b0fe51db6859..9537c3e9d19022c8499e90e5bcc41e10f47904fc 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -12,7 +12,6 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -43,7 +42,6 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,7 +73,6 @@
     project-name: 'genius'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 6cafff9293d343d75ee58776fa736907abddbe12..4d42d19cd478f3093dad543717c667eec9c51d69 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -21,15 +21,12 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index b79672ed93bcc6e0bc16187e3d015ca0d52b7d52..640a508df9cc2e5c1543e802fcd9996b5fe5dbf8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 47d42d7e664099b79771de9328ee21ced5960a54..0fc6787a1c2c2d665147896b6766e2d4d1a86950 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 0fb50b7af4967f72470fbb3973ff78dce2678bd4..af92ac1f9081cd3f41fccfe64c665c234608443d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 690eb6ac11f6d403600b7cfc0f201500ef961796..e722b1a5951e81d1f4ce91ea5fa3b532185c6384 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -13,13 +13,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 1bd9015e398a09ac086428437aef8cb1930a32ab..8d25bb78ef7d78428030c4bfa71dc7d6bdb69df8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -12,7 +12,6 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -43,7 +42,6 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,7 +73,6 @@
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 961591d84e627fc8e35bdde8c0f787a787af9271..3af61b89c9d6093b709d77c6f445cc63be190d9a 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -12,7 +12,6 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'vbd'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 75b913502f18f14c8f0de5752258442f057c0af5..c174df59d4cf521edd858af6508604970fbce7d2 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -12,7 +12,6 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'infrautils'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 0a0d61305d053431b688d56475275379f33e9553..fa5d9de21ce5902d71d1fee7081a978ce7f90cab 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -14,17 +14,12 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
-    # TODO: Add Beryllium when everything is backported there.
-
     install:
       - all:
           scope: 'all'

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index b3fa5d273149cecb4a8ca2b5d50dc12ecebc9699..3231c78bb24544c4e4b55ca3952c07ead777dc04 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -20,8 +20,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[int/dist]'
-    jdk: openjdk8
-    jre: openjdk8
 
     stream:
       - oxygen:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cb0b81e1eb0e6e990781bc0c8ae008f4707f50ba..e440fe3b37e009e973d0c6611e4b67e85058416a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,7 +18,6 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
@@ -27,7 +26,6 @@
 
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
@@ -37,8 +35,6 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          jdk: 'openjdk8'
-          jre: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'

diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
index 942cbfaaa39181ffc66a6537bfdeca2b818803ce..22e61a94ca19d5716df0170eeca10cdca1269bda 100644 (file)
--- a/jjb/integration/integration4-templates.yaml
+++ b/jjb/integration/integration4-templates.yaml
@@ -1,4 +1,7 @@
 ---
+
+# TODO: This is only potentionally useful for Carbon. Remove this when Carbon is not supported anymore.
+
 - job-template:
     name: '{project}-csit4-1node-{functionality}-{install}-nitrogen'
     # Keep synchronized with *-csit-* please.

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 6c4547b03f9323a57896175203e3932d71647370..2903451c301c374b786d8965dc9be10c7d227d38 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 7af120d48b7f93f71ee301aabc5d1a02f6501275..aa58386d0b53ad849cfb0ca695a8a1685b6257f5 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -12,7 +12,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'iotdm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 4dcb2780fb34d8f164aaf1444f9f158fb78e2ed6..a7138120710fe18c667cacf3094211269cd67812 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -17,16 +17,13 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip'

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 5e1f1065e065a8f3bffb116c89838771b0f0ec05..206efa4af2d835d6d4ebba1cde050440d2a78f07 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -11,7 +11,6 @@
     project-name: 'jsonrpc'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project-name: 'jsonrpc'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index f2e50847b720cc38ade668e35c41f57d81828dc5..f5901407518277cfac240d0e24447fd3002d08f6 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 8a14298da0e4451b5e9b6027b1173c01af30dce4..f05ac233d92029d4e5122d5a6c136dfb656edf58 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index af91a3d9d0b1d459640fd0c90007cc7071cd08e6..a5366538c8cb5bb861241cb311abee65a1471de2 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 59f6007cc8a33f9af66ef5142b5e31fccbef7eef..bee9bf7a379df57f8da75b0957888bf675795860 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -11,13 +11,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 460e615cbbdb489ac071805d64459c043137c50a..0710a32f6a713bcde88d6715ead5aeec42f5d1b5 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -12,7 +12,6 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -43,7 +42,6 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,7 +73,6 @@
     project-name: 'l2switch'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index a379ff83d507442beef25571aad53d756618642c..e508b22d80ca3956159976e925e92a87f4e752a1 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 10cb7dd2446e52c2690e4d86590f7401cc7bea6c..8f66995e8b9d7bf26d27745302f3f7e0ae5c7c46 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -12,7 +12,6 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -38,7 +37,6 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -65,7 +63,6 @@
     project-name: 'lacp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index dd3f02f298895dbd789eed792b1d0fd1c53b11e8..d0ffdf7b97118d9bb271d1f493ec305097f328ce 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 722794c0b4e7e8c5b5247f9f459babf20e2c299e..72ed9c2d7bdabdb65990c6421149de00ce7b26f6 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 5cbb2efbce877401edd3c7ce9f86233a3d15c4fc..f4723eb47f54519665ba3d0ea35e5ac4a1a58806 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -12,7 +12,6 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -39,7 +38,6 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -67,7 +65,6 @@
     project-name: 'lispflowmapping'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b018bb00a8b363d581baf6835677f8d9af8708c0..133d7098f96386766688fd5d6dd43c583ec7ae61 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -13,13 +13,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 37704cd8194a7ca3abb87f9c15827c3168aafb24..c937d67cbd235038c5642a93cf6c509084c53ff0 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -12,7 +12,6 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'mdsal'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index b736e74fb83f5c3aaa09d7b850ad87b6f857e153..45eadc26dfc7a6f72059a7068cb5893af66c1984 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 5a3c3bdc9515593043a9ec2c04f63fd0521681fe..95a1ac9b66c2eb4c3d12a0148d7e3725e477d106 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -12,7 +12,6 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'messaging4transport'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
index 6e16dcea6a43e9fee1d0b2685232c44532c45202..c497cb8e7f0850e5ef71e8349c2602863e15d380 100644 (file)
--- a/jjb/natapp/natapp-csit-basic.yaml
+++ b/jjb/natapp/natapp-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 68b25c20ad687fd53bdb0039a971f25c2feb3007..f08601eb8a74f128e5160e29ae5037ed2bbeb9ce 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -12,7 +12,6 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'natapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 9f4509d30e0375ec560ce85c34e108008536c7fb..5fd1f995020f47f0f2685ddbd3bb8c4491be9ffd 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 89f541030c04ac8f2855c79449185ff5f2ab38e7..7555f5787c11c043718e2d93dcaa1801e7c2a373 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -12,7 +12,6 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'nemo'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 6580c76baecdd6a85cfffc5810993f115951d64b..65ab143da28dff59367f8f4970d8c26c49079882 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 6b9fb1af8302534d234622a6547b0d1339ccc2b2..de4492d771f2037401d5af3bb0276ff637911790 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 90583ad300c58e90bc2696e4b192903f58da2ab8..51c272d145ef9dcb504b406afd6412024acd94e0 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 976e55aabc6563cf395b2b3611b69d68f533c88e..1148ba026275b413200f318bd116827109c27885 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index e406a318ee2d8292b332b67b9634c13ed3df1a03..74fcde32aba979042bc8b7b7a57e50e9d8f5c593 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -11,13 +11,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 298c32fbe1e1c46b5999aa04115f32fb78c642b0..b9a00653cf0005d1704efac23f1567b319ee9229 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index a8ce3cd34bae487115331fdc284a649d74c97250..8316a476cb5cebeabdf763c3a1813acd821c5945 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -17,13 +17,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index d8d422588e47916bd0e340e5b32e68d40319741e..1c850ce8788c712df2872932997052435a19377c 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -12,7 +12,6 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'netconf'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 7857f528167ff53f2a70142ac3646509dea3976a..6b228d3d6692954ece5d0c54b635ca40382b24ba 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index a7436e6797a637b7f738c754975e8bc2db110117..eaed56d4a8fc06f8692059c27731254d76ff8956 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -12,7 +12,6 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'netide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 9d4b101b498043b1189ab67bf1b87f76f9708aae..eba1b27dd1b987855f08a7e72e75cc56d82328a8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,7 +7,6 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -71,7 +70,6 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -138,7 +136,6 @@
 
     stream: 'carbon'
     branch: 'stable/carbon'
-    jre: 'openjdk8'
     karaf-version: karaf3
 
     topology:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 7a31b0b359f500e5a03a7c001861aa6a2825bc23..251481ee47cdfe644a08305689ac497bcecc9da6 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -7,7 +7,6 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -73,7 +72,6 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -139,7 +137,6 @@
     project: 'netvirt'
     stream: 'carbon'
     branch: 'stable/carbon'
-    jre: 'openjdk8'
     karaf-version: karaf3
 
     topology:
@@ -212,13 +209,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     openstack:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 53d543e81f300e38fe53c641fcd67381d939b532..f3e2446a303fabe6ec88b0d2d8c543c2b6b5c314 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -7,15 +7,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
           karaf-version: karaf3
 
     project: 'netvirt'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 9929fc93085478041c29097218ab7eb22f0b6ca9..d573b3b67f34f87f4b0ad2f4d8f8dd2c69c33eee 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -19,7 +19,6 @@
           karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -49,7 +48,6 @@
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index db79a7ff3e5dc9a0960fc1675bcc1cb00f1ad6ae..2bd13426c8a70130a99efccfea06b829ac1247a1 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -13,7 +13,6 @@
     project-name: 'neutron'
     build-timeout: 60
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -40,7 +39,6 @@
     project-name: 'neutron'
     build-timeout: 60
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -68,7 +66,6 @@
     build-timeout: 60
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 6e9cb5b3fff0040efbd8ca4bd8cd781ead120a3e..bab60f9f38bf8777c5a1a35b744e435d66a3a457 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -12,7 +12,6 @@
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'next'
     project-name: 'next'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'next'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index bb5f81a00a05b84ce6049491ce2669efeb533b62..e82909d6bbf559c56357549eed3cc9027f23de7a 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index be4ba859abaa70f678b0df77ce2bbc6e90d3d68c..f97d0dcfe9aeb006ce4ce7a814a44132473873e2 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -12,7 +12,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'nic'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index 2b05a076862986b3709735ad598e59978c577c5c..50d924e573037a6dbef520494ef029208bcc4db1 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index 1990796c4469253c1c2231cbb79c721cb5d6e30a..125e70e72ca5dcea42d789a3af745105ab9b0525 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index f1f38a0ff2a8d7de37d6e33c097761ef7f068ad6..839d9614be84c17adc7519bec5e40ae55c10cc37 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -12,7 +12,6 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'ocpplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index d0209dff3a8e7d9e1c7bb4b7dc8afd94f4f780dc..241a67931fcb8dfc712c828bc8d77fdb0742c0ac 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -13,7 +13,6 @@
     branch: master
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -46,7 +45,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -80,7 +78,6 @@
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index 62c6444dea14e27368acb2f7f40bf0cf5fcabb19..c8ba5c7a26e7cc1b525abc195c4c15027cc8c2a8 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index c4b9f3c47b67b7415c5115afd7287cc8e75c4404..1a4f66400d7a2b6d0cb3e654d4e5d73cf7d15fdb 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -12,7 +12,6 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'of-config'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 3112d08114c1ca4c62cf4abcdf07cabb937beefd..4a56593fe4ba0d1277e633486bd53e33eafbdb28 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -11,7 +11,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -61,7 +59,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 4cb31bcb315a1cc01abca4386a45b141dae6055a..e20d5a0f7609bec89a9b0ed525c1ce67dcb1b2da 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -12,7 +12,6 @@
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -39,7 +38,6 @@
     project-name: 'openflowjava'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
index 8f4aba0ceaf997d4d61034d22512a7511e89cd08..7cf30d232b21c8ba7fe0f8e0b00c9a8028ca74bd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index 1cb47cd9cdc23078eb618e2501eb13886980cdb2..b7a7e5616ddeed275b6df8f5554ae12df134bf17 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index e6258a93608c459083006fbcbb700d066d91f0d5..dd48aae3a36296e76b86e0282e1843fd523bcca9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index 81f97ad39c8ca3da57172e2fefb4fbee47fc0287..1f79451b3e2f6d53834008c1299ca6d349635529 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 9a5fea625be092cef222466bc5f82351feb40005..ff8aefb8fc8cda84a13dfa1eebc3ddc0c6460476 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 43def80ed2eff6caf206251d7b542611f946c19a..b42559e77abd4128ef14763d67bfb91c7e487a25 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 1ef98811c10ad5c7d7f357098af05db9336f3bb3..9aff3f0c924184784e8cf11b187495751483f935 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 39396949c3d310a01568cc8c8de5e51378c1ae8f..1262c9b2d228d074ba5dafc72ffb33ad1378d3a7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index 023f0cc299680c1f222ad906a2472225cccf78fa..42e6a7df290129fd583c4740297cc76cddc776e3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index ee39a43690fcca9297ae77ec4a0b421d40d24ce7..67e9ba28a36f8ce5302040192010ad327aeb9969 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 2b8718fcd75c98cd9ffa2c580425ce36267a87f3..6233f84d782aa6ea4b87a4c3dee7271822f255cb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 5498a63531da809cfd2f7dfbd8d1254d56a280a5..a8b8e525839240678ce423ece54543269a37e1dd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index c59950c1bac1bf43f239daa327da8dec68ab8cd3..75ac354049758a7a4b7ddc611a92485f149cdc06 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 865b1ca3d61a0ab761641792dc3d21097dee31c9..6d66949cc88232ee9fd93f0a9c9cc3f03b9e7b0b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index c0e0471e11f01b5492e0931cfd2b67441808e2e9..f9f79d0067acc0bb0e97f2d901b04f8469fb985a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -12,7 +12,6 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -42,7 +41,6 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -73,7 +71,6 @@
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
index 7c584d8356df7c2f9a2f13976aca977c3834b43b..0f83c0b798bfd0a74b12f8ba5425bfc11c81eb41 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -11,7 +11,6 @@
     stream:
       - oxygen:
           branch: master
-    jdk: openjdk8
     mvn-settings: ovil-settings
     mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 7c2c3991c7ac442b184cc812e3c52a24790b5752..2fc767152867562d957f17084a4c6136fc195f9d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index df55323eaa4753227609b67d6c7e1002570d9305..ed3744c930e2468003492137ae0602162fb4639a 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -16,13 +16,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 4b83b0d0bd78de0ac0c7d620a910865f6a3a19dc..ad0238ba4698e7c922ceebcbdeb868c4e6cce195 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -7,15 +7,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
           karaf-version: karaf3
 
     project: 'ovsdb'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 751b21c1ec2c238ba5df34e09a85bd3da20e61ad..c95ebd933b91d80d33f102996b0594ec2d974a05 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -12,7 +12,6 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'ovsdb'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 660f2104eabe2cde490b5b0f7691c7a85eb1123e..671609f2d6b1dbb694c1e6979bfa976082a1e1a1 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 4a3bf9d3770ab1ba6affd98a9f76b0c61bdddae7..379c1b86d173d180ac02bb7e87f0cada3bf2a789 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -12,7 +12,6 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'packetcable'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 5dad91b0dd077bdeadb94897dd304ad00dd8722d..98ac3ec907e16c86a5a31e847b2c7f394e2f6a34 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -96,6 +96,8 @@
     verify-jdkversion: openjdk8
 
     # Maven / Java
+    java-version: 'openjdk8'
+    jre: 'openjdk8'
     jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index af90b04c3a3f7a60b3619ccd77977258f804747a..c9a2bb4399f3a2a16b85253fd33e2f30534e6b9e 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -11,7 +11,6 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     project-name: 'reservation'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 48bbb0b0ab59c1a3df2f7af9077a1178f204a58b..93cdee812a503403776415e530d60f4b9704b783 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 8d61d315f275fa6698ce5a1d92ac7ed925ddec39..0329c730f6c282e77954587d23dc0e39329e730d 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -12,7 +12,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 0417bfbeb7622a701a1f354613ac0e8887738ace..d9841368ef34b8b85b4109430015195330b333cf 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index c2b20536a6ecccb241054395f5e47d039878def9..0798c705a9c15c544d903c725ef03585f08164ee 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index 113dee043c5e6b2a0fe022e5926f30791b0ee85b..df1ae61b57e7fa808f577cb88f03499ed4e0e253 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -11,13 +11,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
 
     feature:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 1e091f525d1d9fd2df72a1e64876778039304c1f..c69711e8c5352b9bd64d59c65d984251cb4bab17 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -7,10 +7,8 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
 

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 4c1db60a1b2b081feaf8076a2731d7c80149476a..35d55d11aff0a61b7229c6d99fed882f7969b039 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -12,7 +12,6 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'sfc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 826bf95c3f661e3f6c8f69009a9bba2685ca82c3..3472a372ae48eb0f87b2795e009636805c1e29d7 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -12,7 +12,6 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'snbi'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 170ac03927e7bebab9714ec34acea59e6019b061..e8a705c63b24bf9a9508119a2b98fb1abad006a2 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -12,7 +12,6 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'snmp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 37132955b9ec6dd675ac0a2c482b4b91d12c405d..982c6c19b5b85c678ea59e8a5c6623aac5b01e04 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -12,7 +12,6 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'snmp4sdn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 47fe89ded49fbc17cbc29b4b1c611cfd39218378..48fefa83528437050ed949a6a7a539ac7a6dfd5d 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 9f999fc8ee08cd4b7211e2267047298c33008d5e..94490090882879afc5450584e9da9b6899e896b0 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
 

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 1558fd35eeb81fd39caa79673a803be09f58997d..9357903a145cdf19fceec993e04ed226fd675674 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index aca577a0a31d7ae6490446720d1f80c906835dd0..930c1073fbd07c74194494b05508783de1144f51 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 9b3eac025786493c9098a6dacd59ae0632135b57..50fc054c590eedfbe7d45d5ac656235bcbd561c4 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 1693711d2b0d23277e885f4492328e65b36dcb0f..cd76ffac8efd5152c1006aeacf1879f222c2fbdc 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -14,13 +14,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1175fe05c64a37f34ab8bb27ba499dc14f26d027..a8538cd7b820055fd2747f2b872a6c89786c3903 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -12,7 +12,6 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'sxp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index e56ee94a292239af46984c313e1884454ec66a37..03d5fa7768f3c28fd3e12eadc7b6fc1dd28d44d6 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -11,7 +11,6 @@
     project-name: 'systemmetrics'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project-name: 'systemmetrics'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 3e6418f88490d9a4ea9de6a00761c6ce134a8b4a..d80673510af9ffdb7b4678299e7e57cc09dda353 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 4dc477ff9a2b2df0c7f0ed8b59d2ad5e35c18a98..d9381311d5d64d78189db072e7ea2effa9b4396c 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -12,7 +12,6 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'topoprocessing'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 534cb4fee626e6f35d4d5647609d51f55f4e3767..d424f796150c5693561a3dab64a2f7f5d76ea086 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -11,7 +11,6 @@
     project-name: 'transportpce'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project-name: 'transportpce'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 29249729d1fa374fadbd2a86da4b86d574f09c80..75e222127667fc109ace53e26315b9d3f9b009d0 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index efb1bfe5af270d04f4fd83c6c7249856481b1228..4041decbb13072fce7ac424aca097af261943c58 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index cbc43af5823eb32a92819673d1201012ddb78905..d7fb207fbabfe1b33a80d6b3b430316bc9945121 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 60ab2b38f741282c26a7dfee611f58ba4dfc298a..c997550d6392aa8378b18d77a1503df727315c01 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index f90ec708d60ce8a7f206b2ade6b1b944fae03fa1..9ccf6eb5eab48ec5513fdf82552376636be8abbd 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -12,7 +12,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'tsdr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index c5c0a8981f243d7d31c1302fc3db426fea329a34..26a6dde3e50047cd62669008274efe4d26072405 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -12,7 +12,6 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'ttp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 24b9188cc82a37a9f0210120120428f019912f73..4f43a183c69c81641f3f9ad13c13c9e6b1b1fef2 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index a8f9759062c877c4b4e93b5b000b3132108583b4..603511918ca2f572571e84ee92e16b4181362509 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 60bda6dab00b0f3084158e9839a9e64c6a0caef9..1b6f6565d1b0bc13cdfb6f19021d511bcf225e1b 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -12,7 +12,6 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'unimgr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 3cd0fd7fdbcc77744ab745a688a6dcec31bf8324..b1a4980273e1f8048d1f13af29346bb91e5196f0 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 2ec189879cf3e928867d9c0ac8dfcb63b16408ad..44a3c092c5bde0832a9efae835b74d792ca0251d 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e5e85565766d58ddd105708b37675e3bab1fee9d..f0a648e95e3fa7ba1511ac39d7847930db054635 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -12,7 +12,6 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'usc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 1740dfab840f28e681d6a921d940da828fcd09f5..95dc05321efa36f41a6ab20c6d9f004d3509c5b0 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 5afdbd3ee4c8750839a162db6209cd85ed43fca4..fcf7d75637e4018149ce45c6f076dc7de57e57c2 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -12,7 +12,6 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'usecplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 122ae874c977dea5fed8d11e96efb43517e92499..8a023d3d8c5f48f6386bf8f2bf815344b267d85c 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 18162124934d6ac5c52c4a352937bc5d34470c48..de9d9b89695f3e9ac8f758d1c3aece72a06cb920 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 59f9284e22b892dc943b1f4ad8e5489d25861dd6..7b5f7cff4ac8c2358b0e77b0c33451f36d15fe19 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 1aca07d541b4c2b4cd9d7e90d7a16aa37d285c91..d17a2f068fa5d81f05d7311096f5e8e4490b26a5 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -22,13 +22,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     openstack:

diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
index 1195053c0f0ca4994644b4d6844e956d2960f499..6e378e4a5eab445b43f146cf1dc2f310e515aa06 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -13,19 +13,16 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
           csit-list: >
              vtn-csit-1node-manager-all-{stream},
              vtn-csit-3node-manager-all-{stream}
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
           csit-list: >
              vtn-csit-1node-manager-all-{stream},
              vtn-csit-3node-manager-all-{stream}
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
           csit-list: >
              vtn-csit-1node-manager-all-{stream},

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 0d2319dd6898924db83ba05a2d2713c27b7c024a..8e6f8f1de1dfb4662663c7d966cc8dfbf8aa684a 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -12,7 +12,6 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -42,7 +41,6 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -73,7 +71,6 @@
     project-name: 'vtn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 06e6500b7f985a4be23f2b8482ee617e36ea1ce9..2bebf295005b7ec81a322c95d6f73c732d38f4b5 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -12,7 +12,6 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,6 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -65,7 +63,6 @@
     project-name: 'yang-push'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/yangide/yangide-releng.yaml b/jjb/yangide/yangide-releng.yaml
index c10f9eb5609ec60ec18acd9a37c3c96f1277691c..cad1f2fbbdb20a5595e52c201c3cc35ce0fd6ff5 100644 (file)
--- a/jjb/yangide/yangide-releng.yaml
+++ b/jjb/yangide/yangide-releng.yaml
@@ -7,6 +7,5 @@
 
     project: yangide
     project-name: 'yangide'
-    jdk: 'openjdk8'
     stage-id: 'fba306956f98'
     mvn-settings: 'yangide-settings'

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 832627a470a86555223072e26d30cdb629505ef6..e7c3ae7ea2308fb561505ff108e0a6ccc43dde7f 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -11,7 +11,6 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -36,7 +35,6 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -62,7 +60,6 @@
     project-name: 'yangide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 0b523d00222492cc4eac62c3c529467b65e1adce..0cd058196c0daceb963003ef4d59c31f49377d12 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -15,13 +15,10 @@
       # The tested component was only introduced in Carbon.
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index ea6fd77122c71076f7102e1ccd470b69c2a4f1a7..3573a6aac4bf9ce8edd187ed5dd24b77159821e1 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -12,7 +12,6 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -39,7 +38,6 @@
     project-name: 'yangtools'
     branch: 'v1.2.x'
     distribution_branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -66,7 +64,6 @@
     project-name: 'yangtools'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: