From 5a6ea423022e8d3e663097d510513dde2a56b7e9 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 15 Feb 2016 18:14:47 +0100
Subject: [PATCH] Rework the way Java version is set in CSIT jobs

Set only JAVA_HOME to point to a java-{version} symlink.
No "sudo alternatives", as target machine may not allow that.

Use "jre" to propagate Java version to csit and deploy jobs.
Remove an unused integration bash file.
Remove duplicate steps in cluster setup.

Change-Id: I014faba69b00bc6d93a533a3cc2290106e9c4c18
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 jjb/aaa/aaa-csit-authn-stable-helium.yaml     |   2 +-
 jjb/aaa/aaa-csit-authn.yaml                   |   6 +-
 jjb/aaa/aaa-csit-idmlite.yaml                 |   6 +-
 jjb/alto/alto-csit-setup.yaml                 |   6 +-
 jjb/armoury/armoury-csit-basic.yaml           |   4 +-
 jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml        |   9 +-
 jjb/bgpcep/bgpcep-csit-throughpcep.yaml       |   6 +-
 jjb/bgpcep/bgpcep-csit-userfeatures.yaml      |   6 +-
 jjb/capwap/capwap-csit-ac.yaml                |   6 +-
 jjb/centinel/centinel-csit-basic.yaml         |   6 +-
 .../controller-csit-clustering-lithium.yaml   |   2 +-
 .../controller-csit-clustering.yaml           |   4 +-
 .../controller-csit-nsf-stable-helium.yaml    |   2 +-
 .../controller-csit-rest-cars-perf.yaml       |   6 +-
 jjb/didm/didm-csit-discovery.yaml             |   6 +-
 .../groupbasedpolicy-csit-3node.yaml          |   6 +-
 .../groupbasedpolicy-csit-6node.yaml          |   6 +-
 .../groupbasedpolicy-csit-clustering.yaml     |   6 +-
 ...w-integration-configure-clustering-list.sh | 108 ------------------
 ...de-raw-integration-configure-clustering.sh |  18 ++-
 ...w-integration-deploy-controller-offline.sh |  14 ++-
 ...-integration-deploy-controller-run-test.sh |  28 ++---
 ...aw-integration-deploy-controller-verify.sh |  14 ++-
 ...clude-raw-integration-deploy-controller.sh |  20 ----
 ...lude-raw-integration-distribution-check.sh |  14 ++-
 ...-raw-integration-install-robotframework.sh |   3 +
 .../integration-csit-basic-stable-helium.yaml |   2 +-
 jjb/integration/integration-csit-basic.yaml   |   6 +-
 .../integration-distribution-jobs.yaml        |  16 +--
 jjb/integration/integration-templates.yaml    |  21 ++--
 jjb/integration/integration-test-jobs.yaml    |  11 +-
 jjb/iotdm/iotdm-csit-basic.yaml               |   6 +-
 .../l2switch-csit-host-scalability-daily.yaml |   6 +-
 jjb/l2switch/l2switch-csit-scalability.yaml   |   6 +-
 .../l2switch-csit-switch-stable-helium.yaml   |   2 +-
 jjb/l2switch/l2switch-csit-switch.yaml        |   6 +-
 jjb/lacp/lacp-csit-lacp.yaml                  |   6 +-
 ...ispflowmapping-csit-all-stable-helium.yaml |   2 +-
 ...spflowmapping-csit-all-stable-lithium.yaml |   2 +-
 .../lispflowmapping-csit-msmr.yaml            |   4 +-
 .../lispflowmapping-csit-performance.yaml     |   4 +-
 ...sal-csit-periodic-dsbenchmark-lithium.yaml |   2 +-
 .../mdsal-csit-periodic-dsbenchmark.yaml      |   4 +-
 .../messaging4transport-csit-basic.yaml       |   4 +-
 jjb/nemo/nemo-csit-engine.yaml                |   4 +-
 jjb/netconf/netconf-clustering.yaml           |   4 +-
 jjb/netconf/netconf-scale.yaml                |   6 +-
 jjb/netconf/netconf-userfeatures.yaml         |   6 +-
 jjb/netide/netide-csit-basic.yaml             |   4 +-
 jjb/nic/nic-csit-basic.yaml                   |   6 +-
 jjb/nic/nic-csit-vtnrenderer.yaml             |   4 +-
 ...-bulk-matic-ds-daily-lithium-redesign.yaml |   6 +-
 ...enflowplugin-csit-bulk-matic-ds-daily.yaml |   6 +-
 .../openflowplugin-csit-cbench-daily.yaml     |   6 +-
 ...t-cbench-performance-lithium-redesign.yaml |   6 +-
 ...penflowplugin-csit-cbench-performance.yaml |   6 +-
 ...wplugin-csit-clustering-helium-design.yaml |   3 +
 .../openflowplugin-csit-clustering.yaml       |   6 +-
 ...t-config-performance-lithium-redesign.yaml |   6 +-
 ...penflowplugin-csit-config-performance.yaml |   6 +-
 ...n-csit-flow-services-lithium-redesign.yaml |   6 +-
 ...flowplugin-csit-flow-services-lithium.yaml |   2 +-
 ...ugin-csit-flow-services-stable-helium.yaml |   2 +-
 .../openflowplugin-csit-flow-services.yaml    |   4 +-
 ...nk-scalability-daily-lithium-redesign.yaml |   6 +-
 ...lowplugin-csit-link-scalability-daily.yaml |   6 +-
 ...lugin-csit-longevity-lithium-redesign.yaml |   4 +-
 .../openflowplugin-csit-longevity.yaml        |   4 +-
 ...c-time-measure-daily-lithium-redesign.yaml |   6 +-
 ...lowplugin-csit-rpc-time-measure-daily.yaml |   6 +-
 ...it-scalability-daily-lithium-redesign.yaml |   6 +-
 ...openflowplugin-csit-scalability-daily.yaml |   6 +-
 ...gin-csit-scalability-lithium-redesign.yaml |   6 +-
 .../openflowplugin-csit-scalability.yaml      |   6 +-
 ...ats-collection-daily-lithium-redesign.yaml |   6 +-
 ...gin-csit-scale-stats-collection-daily.yaml |   6 +-
 ...sit-statistics-basic-lithium-redesign.yaml |   4 +-
 ...sw-scalability-daily-lithium-redesign.yaml |   6 +-
 ...nflowplugin-csit-sw-scalability-daily.yaml |   6 +-
 jjb/ovsdb/ovsdb-csit-clustering.yaml          |   6 +-
 jjb/ovsdb/ovsdb-csit-netvirt.yaml             |   6 +-
 jjb/ovsdb/ovsdb-csit-scalability-daily.yaml   |   6 +-
 jjb/ovsdb/ovsdb-csit-southbound.yaml          |   6 +-
 .../packetcable-csit-pcmm-lithium.yaml        |   2 +-
 jjb/packetcable/packetcable-csit-pcmm.yaml    |   4 +-
 .../sdninterfaceapp-csit-basic.yaml           |   4 +-
 jjb/sfc/sfc-csit-clustering-lithium.yaml      |   2 +-
 jjb/sfc/sfc-csit-clustering.yaml              |   4 +-
 jjb/snmp/snmp-csit-basic.yaml                 |   6 +-
 jjb/sxp/sxp-csit-basic.yaml                   |   6 +-
 jjb/sxp/sxp-csit-filtering.yaml               |   2 +
 jjb/sxp/sxp-csit-topology.yaml                |   6 +-
 ...opoprocessing-csit-topology-operation.yaml |   4 +-
 jjb/tsdr/tsdr-csit-cassandra.yaml             |   4 +-
 jjb/tsdr/tsdr-csit-hbase.yaml                 |   4 +-
 jjb/tsdr/tsdr-csit-hsqldb.yaml                |   4 +-
 jjb/unimgr/unimgr-csit-basic.yaml             |   4 +-
 jjb/usc/usc-csit-channel.yaml                 |   6 +-
 jjb/usecplugin/usecplugin-csit-basic.yaml     |   4 +-
 .../vpnservice-csit-vpnservice.yaml           |   6 +-
 jjb/vtn/vtn-csit-coordinator.yaml             |   6 +-
 jjb/vtn/vtn-csit-manager-stable-helium.yaml   |   2 +-
 jjb/vtn/vtn-csit-manager-stable-lithium.yaml  |   2 +-
 jjb/vtn/vtn-csit-manager.yaml                 |   4 +-
 104 files changed, 332 insertions(+), 385 deletions(-)
 delete mode 100644 jjb/integration/include-raw-integration-configure-clustering-list.sh

diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
index 5cf3172c8..f0aa8ef88 100644
--- a/jjb/aaa/aaa-csit-authn-stable-helium.yaml
+++ b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 89d7fc764..695414e12 100644
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 112d84365..a7f58f037 100644
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 202f3e473..3dd9fdc48 100644
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index 2f24991e0..dd694f9ee 100644
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index e81d79757..dd0d1bf84 100644
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -51,10 +51,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 49dde52e7..0dd152479 100644
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 09727d51a..4bcc03eb1 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 63e7fd08d..1b149586e 100644
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index 7ddc7c73c..9bca57712 100644
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
index 8b9dabcf3..d98470535 100644
--- a/jjb/controller/controller-csit-clustering-lithium.yaml
+++ b/jjb/controller/controller-csit-clustering-lithium.yaml
@@ -13,7 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 68fc79d37..79ce7e65e 100644
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/controller/controller-csit-nsf-stable-helium.yaml b/jjb/controller/controller-csit-nsf-stable-helium.yaml
index fac4513c9..6908d6e35 100644
--- a/jjb/controller/controller-csit-nsf-stable-helium.yaml
+++ b/jjb/controller/controller-csit-nsf-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 7e1dc271d..79c3960ff 100644
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index dc4d6b1d8..cdcecae52 100644
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index da95b78c1..b695c0c80 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 4f4f0ce79..07d1d4192 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 1db1ccc18..6aa47fe93 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/integration/include-raw-integration-configure-clustering-list.sh b/jjb/integration/include-raw-integration-configure-clustering-list.sh
deleted file mode 100644
index 77301b123..000000000
--- a/jjb/integration/include-raw-integration-configure-clustering-list.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015 Brocade Communications Systems, Inc. and others.  All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-#
-
-
-echo "#################################################"
-echo "##         Configure Cluster and Start         ##"
-echo "#################################################"
-
-AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
-MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
-MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
-JOLOKIACONF=/tmp/${BUNDLEFOLDER}/deploy/jolokia.xml
-
-# Create the list of controllers from the CONTROLLER_LIST variable
-ODL_SYSTEM_IPS=( ${ODL_SYSTEM_IP_LIST//,/ } )
-
-# Utility function for joining strings.
-function join {
-    delim=',\n\t\t'
-    final=$1; shift
-
-    for str in $* ; do
-	final=${final}${delim}${str}
-    done
-
-    echo ${final}
-}
-
-# Create the strings for data and rpc seed nodes
-# First create various arrays with one element per controller.
-# Then merge each array using the join utility defined above.
-count=1
-for ip in ${ODL_SYSTEM_IPS[@]} ; do
-   data_seed_nodes[$count]=\\\"akka.tcp:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
-   rpc_seed_nodes[$count]=\\\"akka.tcp:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
-   member_names[$count]=\\\"member-${count}\\\"
-   count=$[count + 1]
-done
-data_seed_list=$(join ${data_seed_nodes[@]})
-rpc_seed_list=$(join ${rpc_seed_nodes[@]})
-member_name_list=$(join ${member_names[@]})
-
-# echo ${ODL_SYSTEM_IP_LIST}
-# echo ${ODL_SYSTEM_IPS[@]}
-# echo ${data_seed_list}
-# echo ${rpc_seed_list}
-# echo ${member_name_list}
-
-# Create the configuration script to be run on controllers.
-cat > ${WORKSPACE}/configuration-script.sh <<EOF
-
-CONTROLLERID="member-\$1"
-CONTROLLERIP=\$2
-
-echo "Configuring hostname in akka.conf"
-sed -i -e "s:{{HOST}}:\${CONTROLLERIP}:" ${AKKACONF}
-
-echo "Configuring data seed nodes in akka.conf"
-sed -i -e "s/{{{DS_SEED_NODES}}}/[${data_seed_list}]/g" ${AKKACONF}
-
-echo "Configuring rpc seed nodes in akka.conf"
-sed -i -e "s/{{{RPC_SEED_NODES}}}/[${rpc_seed_list}]/g" ${AKKACONF}
-
-echo "Define unique name in akka.conf"
-sed -i -e "s/{{MEMBER_NAME}}/\${CONTROLLERID}/g" ${AKKACONF}
-
-echo "Define replication type in module-shards.conf"
-sed -i -e "s/{{{REPLICAS_1}}}/[${member_name_list}]/g" ${MODULESHARDSCONF}
-sed -i -e "s/{{{REPLICAS_2}}}/[${member_name_list}]/g" ${MODULESHARDSCONF}
-sed -i -e "s/{{{REPLICAS_3}}}/[${member_name_list}]/g" ${MODULESHARDSCONF}
-sed -i -e "s/{{{REPLICAS_4}}}/[${member_name_list}]/g" ${MODULESHARDSCONF}
-
-echo "Dump akka.conf"
-cat ${AKKACONF}
-
-echo "Dump modules.conf"
-cat ${MODULESCONF}
-
-echo "Dump module-shards.conf"
-cat ${MODULESHARDSCONF}
-
-echo "Starting controller..."
-/tmp/${BUNDLEFOLDER}/bin/start
-
-EOF
-
-# Copy over the configuration script and configuration files to each controller
-# Execute the configuration script on each controller.
-for i in "${!ODL_SYSTEM_IPS[@]}"
-do
-    echo "Configuring member-$((i+1)) with IP address ${ODL_SYSTEM_IPS[$i]}"
-    ssh ${ODL_SYSTEM_IPS[$i]} "mkdir /tmp/${BUNDLEFOLDER}/configuration/initial"
-    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template ${ODL_SYSTEM_IPS[$i]}:${AKKACONF}
-    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template ${ODL_SYSTEM_IPS[$i]}:${MODULESCONF}
-    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template ${ODL_SYSTEM_IPS[$i]}:${MODULESHARDSCONF}
-    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template ${ODL_SYSTEM_IPS[$i]}:${JOLOKIACONF}
-    scp  ${WORKSPACE}/configuration-script.sh    ${ODL_SYSTEM_IPS[$i]}:/tmp/
-    ssh ${ODL_SYSTEM_IPS[$i]} "bash /tmp/configuration-script.sh $((i+1)) ${ODL_SYSTEM_IPS[$i]}"
-done
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
-
diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh
index 35b7f08c0..bf5ba87a4 100644
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -13,7 +13,7 @@ function join {
     final=$1; shift
 
     for str in $* ; do
-	final=${final}${delim}${str}
+        final=${final}${delim}${str}
     done
 
     echo ${final}
@@ -71,6 +71,22 @@ cat ${MODULESCONF}
 echo "Dump module-shards.conf"
 cat ${MODULESHARDSCONF}
 
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+JAVA_RESOLVED=`readlink -e "\${JAVA_HOME}/bin/java"`
+echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+echo "JDK default version ..."
+java -version
+
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index c91f3f301..e892f2198 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -36,7 +36,19 @@ MEMCONF=${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv
 sed -ie "s/2048m/${CONTROLLERMEM}/g" ${MEMCONF}
 cat ${MEMCONF}
 
-echo "JDK Version ..."
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+readlink -e "${JAVA_HOME}/bin/java"
+echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
 echo "Starting controller..."
diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 0c0ff7e3e..c17efb377 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -31,19 +31,6 @@ fi
 
 cat > ${WORKSPACE}/controller-script.sh <<EOF
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
-    echo "Setting the JDK Version to 8"
-    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64
-    java -version
-fi
-if [ ${JDKVERSION} == 'openjdk7' ]; then
-    echo "Setting the JDK Version to 7"
-    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64
-    java -version
-fi
-
 echo "Changing to /tmp"
 cd /tmp
 
@@ -74,7 +61,20 @@ cat \${MEMCONF}
 echo "Listing all open ports on controller system..."
 netstat -natu
 
-echo "JDK Version ..."
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+JAVA_RESOLVED=`readlink -e "\${JAVA_HOME}/bin/java"`
+echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+echo "JDK default version ..."
 java -version
 
 echo "Starting controller..."
diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index 2066e3e2b..863ba3ae8 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -35,7 +35,19 @@ netstat -natu
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
 
-echo "JDK Version ..."
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+readlink -e "${JAVA_HOME}/bin/java"
+echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
 echo "Starting controller..."
diff --git a/jjb/integration/include-raw-integration-deploy-controller.sh b/jjb/integration/include-raw-integration-deploy-controller.sh
index 50d15a8d2..d9ac4da92 100644
--- a/jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller.sh
@@ -16,19 +16,6 @@ ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
 
 cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
-    echo "Setting the JDK Version to 8"
-    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64
-    java -version
-fi
-if [ ${JDKVERSION} == 'openjdk7' ]; then
-    echo "Setting the JDK Version to 7"
-    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64
-    java -version
-fi
-
 echo "Changing to /tmp"
 cd /tmp
 
@@ -56,12 +43,6 @@ MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
 sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
 cat \${MEMCONF}
 
-echo "Listing all open ports on controller system"
-netstat -natu
-
-echo "JDK Version ..."
-java -version
-
 EOF
 
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
@@ -73,4 +54,3 @@ do
 done
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
-
diff --git a/jjb/integration/include-raw-integration-distribution-check.sh b/jjb/integration/include-raw-integration-distribution-check.sh
index d0c8b002c..1f6b03b22 100644
--- a/jjb/integration/include-raw-integration-distribution-check.sh
+++ b/jjb/integration/include-raw-integration-distribution-check.sh
@@ -39,7 +39,19 @@ netstat -natu
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
 
-echo "JDK Version ..."
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+    echo "Setting the JRE Version to 8"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    echo "Setting the JRE Version to 7"
+    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
+    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
+    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+fi
+readlink -e "${JAVA_HOME}/bin/java"
+echo "JDK Version should be overriden by JAVA_HOME"
 java -version
 
 echo "Starting controller..."
diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 0f8bdf984..778a70e91 100644
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -23,4 +23,7 @@ pip install -q robotframework{,-{httplibrary,requests,sshlibrary,selenium2librar
 # jsonpath is needed by current AAA idmlite suite
 pip install -q jsonpath-rw
 
+# print installed versions
+pip freeze
+
 # vim: sw=4 ts=4 sts=4 et ft=sh :
diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
index 7bd9c05e6..88569af84 100644
--- a/jjb/integration/integration-csit-basic-stable-helium.yaml
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -15,7 +15,7 @@
     stream:
        - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index 266f9a5a2..cfd8819b4 100644
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -16,13 +16,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 2fb16d62a..d0908fd69 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -10,16 +10,16 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
 
 - job-template:
@@ -28,7 +28,7 @@
     project-type: maven
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -93,7 +93,7 @@
 
     project-type: maven
     node: dynamic_merge
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -166,7 +166,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
@@ -215,7 +215,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 3a4cade5e..a3008b4ca 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -15,6 +15,7 @@
 # Parameters:
 #
 # project-parameter: main project integration/test ($PROJECT)
+# jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
@@ -56,7 +57,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -136,7 +137,7 @@
         - integration-patch-refspec:
             branch: 'stable/helium'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -241,7 +242,9 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        # TODO: Use integration-jdk-version macro when switching to Boron
+        - integration-jdk-version:
+            jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -321,7 +324,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -424,7 +427,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -522,7 +525,9 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        # TODO: Use integration-jdk-version macro when switching to Boron
+        - integration-jdk-version:
+            jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -604,7 +609,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -709,7 +714,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 3da167f62..3d84b9914 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -12,6 +12,7 @@
         - boron:
             branch: 'master'
             jdk: 'openjdk8'
+            jre: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -74,6 +75,7 @@
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -138,6 +140,7 @@
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -185,6 +188,7 @@
         - stable-helium:
             branch: 'stable/helium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
@@ -295,7 +299,9 @@
             test-plan: 'test-libraries.txt'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
-        # TODO: Use integration-jdk-version macro when switching to Boron
+        - integration-jdk-version:
+            jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -364,7 +370,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -375,7 +381,6 @@
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
-
                   JDKVERSION=$JDKVERSION
 
     publishers:
diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index e530ddf8c..c7dfdc4fa 100644
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index d1ddbc7fd..70c60fc7a 100644
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index ce896a329..4382b6b42 100644
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
index 44cc627be..e9f769ca1 100644
--- a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
+++ b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 24a427082..970751c70 100644
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 19e18dc9a..3ed4e9360 100644
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
index deca072b6..f85df7e37 100644
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
index c7b63adb7..a9ca104a2 100644
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
@@ -13,7 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index d551524a0..4611d2740 100644
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index d1e648569..46fe80361 100644
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
index 62a1b24e3..200452c6f 100644
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
@@ -13,7 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
index 4bce66285..2bc16567e 100644
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
+++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index ab00be3a6..d74579edc 100644
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 66f3c75fa..3d433a851 100644
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index fb2e6e3b8..e5ce55158 100644
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index b43d41319..9bd22585d 100644
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 5a1b56d9f..114ba4d11 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 7fc0dcdeb..d69ac0c58 100644
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 8e3387ec9..95410219c 100644
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 35675a3c8..aa4810552 100644
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -14,11 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
index ccbf77b39..56b0eff55 100644
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
index 45b6ad532..e45758690 100644
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index fa73ce67b..cf8dd43a3 100644
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
index 0e525eaaa..a2efd1535 100644
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index e5a0393b6..8bb2275e2 100644
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
index ac7bf893d..311907db0 100644
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 509838154..2cf6197f4 100644
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
index 5322ec2b6..d07273efd 100644
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index ae62159e5..b306b47c5 100644
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
index 1c3381a15..0cd8d7489 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
index 2886a540e..a4bbd75c8 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
@@ -13,7 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
index 513c76f8f..16121afc4 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0e8baca8a..c6bcd6d84 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
index 9fedb2b4b..016546670 100644
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 3688f2302..e6185dc19 100644
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
index 32eca642e..08c002d8f 100644
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 074efdeb9..dec9532f6 100644
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
index de8873943..c13625949 100644
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
index 10ffcb19c..858ff41f3 100644
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
index 82fb0c5be..6fbcce25c 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 74a9d79a0..4d15d5a81 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
index 48afc44a2..2a0a78713 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index c3fa7821a..f8f1d9ae1 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
index 40fa620d1..d10c6df40 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 239e8d3de..480dedbae 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
index 6b6a4908a..184bd392d 100644
--- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
@@ -13,10 +13,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
index 544a489c1..301e78ff0 100644
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 9ee8ba8bc..c5e74554b 100644
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 545dc87b3..dea21204b 100644
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
index 2ccc23a87..66d1507a1 100644
--- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml
+++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index 32f8ce502..54ce4ded5 100644
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index f10e419c1..065c51508 100644
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
index 432986711..dad0d3afb 100644
--- a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
@@ -13,7 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index f9185b98a..2867a6d9f 100644
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 8823844c9..2b50fec3c 100644
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sfc/sfc-csit-clustering-lithium.yaml b/jjb/sfc/sfc-csit-clustering-lithium.yaml
index 218991dd2..9a0bce4e7 100644
--- a/jjb/sfc/sfc-csit-clustering-lithium.yaml
+++ b/jjb/sfc/sfc-csit-clustering-lithium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
index e80185400..996d5bf16 100644
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ b/jjb/sfc/sfc-csit-clustering.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index a54979c58..6bf6c0942 100644
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index e616ddd3c..c579f9370 100644
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index b8442fe50..7c227dd58 100644
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -13,8 +13,10 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index a7b5dbfb8..6acadd8b1 100644
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 8ec3d3b75..0723848d7 100644
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 53f43abb9..f9208b31d 100644
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 3902035cf..5da3bd853 100644
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index cd489cee9..f94e01313 100644
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index e23f0913f..5b9377caf 100644
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 107b570df..a559f11eb 100644
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index d0fb0133d..aaeb6daf5 100644
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index ffd980747..11afa6102 100644
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -14,13 +14,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 1b2d27523..01f365cb4 100644
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -14,13 +14,13 @@
     stream:
 #        - boron:
 #            branch: 'master'
-#            jdk: 'openjdk8'
+#            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/vtn/vtn-csit-manager-stable-helium.yaml b/jjb/vtn/vtn-csit-manager-stable-helium.yaml
index 6e64e6651..b507ce242 100644
--- a/jjb/vtn/vtn-csit-manager-stable-helium.yaml
+++ b/jjb/vtn/vtn-csit-manager-stable-helium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
index ee6b04994..dd2a09a8b 100644
--- a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
+++ b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
@@ -14,7 +14,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 95b4a9039..827769b9b 100644
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -14,10 +14,10 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
-- 
2.36.6