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>

diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
index 5cf3172c8f7ac6f4aee49c2a1caf9456248c81a1..f0aa8ef88c2c7026a4a18e556a49e13fd834dda7 100644 (file)
--- 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 89d7fc764467162fc538f2c088d8e738021feb2e..695414e12851865cb000454beb16ca78d5695abf 100644 (file)
--- 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 112d84365e43d9e5f3f98aca21862c768423b9b9..a7f58f0372690f16f6d1801f9c07e2ef3618ec06 100644 (file)
--- 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 202f3e4735480f8abb9518e85cabaa41ec819598..3dd9fdc4845643283dcf9531dc53efefad68316d 100644 (file)
--- 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 2f24991e076c778c70a1f8a67db5e86867783f12..dd694f9ee5e43d9fb44696cc71b98a1704bb6f3e 100644 (file)
--- 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 e81d7975738d115c986ff65f47b51d41b8770a7b..dd0d1bf84408f6c950d5343f4d31cdd372e63930 100644 (file)
--- 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 49dde52e7984ba7827868adfdcb91c43eb5befc3..0dd152479276cc2a7869208496c9f2f15aed3c42 100644 (file)
--- 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 09727d51ace61d25f3ea88e684b7ad9b5a277666..4bcc03eb1f078bd7a1d7a5d998baee887759321e 100644 (file)
--- 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 63e7fd08ddadfb24761a5fd7493d93831feb735e..1b149586e777fea53fbb288b278aa7cc49be2e70 100644 (file)
--- 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 7ddc7c73cb527e7be9eaf510c536f99c33b56a40..9bca577129c24a4076cc7513a2d7f12835fe9262 100644 (file)
--- 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 8b9dabcf391aebcfba1e3e0531d3a65518dd0314..d9847053573468a10b50653b59faceaa36ca3193 100644 (file)
--- 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 68fc79d3732fd18ee58a017a00a303e2a6e67d63..79ce7e65ef62df566d251e10cc34f992d4115649 100644 (file)
--- 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 fac4513c9aceb7a69df893116b47a608367dbc89..6908d6e35d4661a6ecaabf5841a9694a736dac89 100644 (file)
--- 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 7e1dc271de0851a65e3fbb564af61e71c76eb566..79c3960ffcbe905dd19142c03ec0a7426d605979 100644 (file)
--- 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 dc4d6b1d809a967784115f1793bd1a4330b2f5f8..cdcecae527c3cdd527b442dd9fe78d5558962231 100644 (file)
--- 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 da95b78c1281c6f9eeca1caeac4314cf7caa4dc8..b695c0c8005ec5f186060f8fd37e8963be5b20cf 100644 (file)
--- 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 4f4f0ce79371590286aab9c670948796aa0bfd73..07d1d41929d02c1bca54d1cadbc9153706639ef1 100644 (file)
--- 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 1db1ccc183cf9c53fff1d18690ee42761035e1f6..6aa47fe93ae6a194543b31601e2cd8291327f0e0 100644 (file)
--- 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 (file)
index 77301b1..0000000
--- 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 35b7f08c04b8e1c9f35f1146d96153f77d4c09b5..bf5ba87a457c76284320f6d88f06a75e3388ea98 100644 (file)
--- 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 c91f3f301c21ddc9e0b0f1b03b670dfb1f708940..e892f21984cec0672f8450491697cd1727cad40b 100644 (file)
--- 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 0c0ff7e3e7e769784d00f780e87c9de313d524e9..c17efb377325cf9578b960bd1c574ea975f9fef2 100644 (file)
--- 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 2066e3e2b942049f5b8bdc129b8784997273077e..863ba3ae8439671eb5d97e157e512192b69a21b1 100644 (file)
--- 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 50d15a8d2fbfee2d104c7c716bd1bab056fe5c91..d9ac4da92cc3f31963efb585c3164bfb7ae4c475 100644 (file)
--- 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 d0c8b002ca3d16379f5f38dedd581b07acbacc8b..1f6b03b224dffc2ea324116a224b24894cf754a3 100644 (file)
--- 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 0f8bdf98478b67858033380b7cfe8f4918413ead..778a70e9119b25e6f32863041f5fe692a3b6af1c 100644 (file)
--- 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 7bd9c05e6fbb36a04cfbaeb7e8400fa4d967ac94..88569af842015bef2886a2a041bc81264c519fee 100644 (file)
--- 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 266f9a5a2b04414a036bb886d0691850550394a2..cfd8819b45b53521a1d61a5c5179605a02334319 100644 (file)
--- 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 2fb16d62ac881088c94adcb26b1e2cd1a112ae4a..d0908fd6989c341022205ad620a1fb814c261b1b 100644 (file)
--- 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 3a4cade5e483d081b99f91ebc3a10e8eb37c94d4..a3008b4ca002119072585329ac233f4502b76dd2 100644 (file)
--- 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 3da167f62c9a585ca8427cd08274ebcb35060846..3d84b991499767293fecfdac844113b919fbc5e1 100644 (file)
--- 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 e530ddf8c7d7fc23cc8f2dd7500b74049d01263d..c7dfdc4faa98736e66c607ab3db74dc83ff7fa78 100644 (file)
--- 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 d1ddbc7fd9a7b547f1f4d63d65ce0d60095aad26..70c60fc7a5fc2bb19cb18885372e1c7c98b3b429 100644 (file)
--- 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 ce896a32916735f5faa6da00f588d2fd263533ba..4382b6b42fc945475c3acd3ded3f71c05955ad10 100644 (file)
--- 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 44cc627be56405bbcfb635da5a2e1b53fe584db4..e9f769ca1dcee4b7370ee7b51d38ae3a3b97cfc9 100644 (file)
--- 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 24a427082be83b7bd2bad737524e9ffc3370dfd1..970751c70cbcb1fecca5056af9c562a5595a2c01 100644 (file)
--- 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 19e18dc9a28bffdcda978b15821f309596b6b0a6..3ed4e93605c400cc5feb718e03aa545ec0445f31 100644 (file)
--- 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 deca072b6b1d708f246e9d9e604ab77a59806504..f85df7e37e53db5ae4d86c21a1fad4fc24db3958 100644 (file)
--- 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 c7b63adb767ff737e23506a764f8c4119f2b167d..a9ca104a2da34906af8fc7a2106771728d6f53a5 100644 (file)
--- 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 d551524a02ead372e68f7dfbf22dba9170983029..4611d2740c564600ca6761e36d18c3985d51e246 100644 (file)
--- 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 d1e64856991d0e1b95f2dd40cc521eea444f14dc..46fe80361436774e19da3c14f4bc01fb1c2fb6d7 100644 (file)
--- 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 62a1b24e3192136797c7429791ca6875c66ddb29..200452c6ff5010d25e6beee012b6c6a71979c90a 100644 (file)
--- 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 4bce66285febffe41284968a3902bf76af584d53..2bc16567e3b45591308976b00dcbf114a3661c6b 100644 (file)
--- 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 ab00be3a6808b0bea4782cf0ec706d19f4db86b0..d74579edc86b4314b76c8f4d565fea08282dfc41 100644 (file)
--- 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 66f3c75fa503efab6a0cee6de8a505c7dca441d2..3d433a8515f4413bb8629c509a637e1a274b21da 100644 (file)
--- 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 fb2e6e3b80d6a74c161e3ffa6ea34061eec0846d..e5ce551582bdc2a77fd84d34856e9e79ef8b37bc 100644 (file)
--- 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 b43d413194cf21fba3b9b1cc23d04ae753164f1c..9bd22585de154e518401b9b9e2f184e5a124e88e 100644 (file)
--- 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 5a1b56d9fe4415e839afb78bae23c88670d1d249..114ba4d11e2ebbf0f931580373e8e3c5d6b61b89 100644 (file)
--- 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 7fc0dcdeb66fd2795f11e7a9027d5af215e15a2e..d69ac0c58317b402a0f24427712baee5ac22bd7a 100644 (file)
--- 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 8e3387ec92afd0671577829a5c4ca8e7762e8789..95410219cf555c006ca73eba5ef16a959dbc6f63 100644 (file)
--- 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 35675a3c80845eed778046ee7495037abf879975..aa48105521319fe0ef0388fd6c369937be33a90e 100644 (file)
--- 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 ccbf77b3970fd3ae55a7b9956d94ef0540467fc8..56b0eff55fefc0ffee770d6b5b85287d0d74bd66 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
@@ -13,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 45b6ad532b1e191dff42d9856a7f047100227fa2..e45758690ab97c2a0d1906e0eb47a81e708eefcd 100644 (file)
--- 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 fa73ce67ba97d334db2ef3fc3a18cb538e209d8f..cf8dd43a3890f7bab7e31bba3fc890811b501e6d 100644 (file)
--- 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 0e525eaaaad19356d239a9d7f8aaa87e722d74f4..a2efd153576f02d9fc8b6bdd3421cf701c0c5a30 100644 (file)
--- 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 e5a0393b60efb44142a1b2523aad85de8e732e5c..8bb2275e2be892c97b06d58e32a8101a7bc4a090 100644 (file)
--- 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 ac7bf893dfe97f24dceecb8845168180cd4f68d2..311907db0cf5f4952619862076447876ec96526d 100644 (file)
--- 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 509838154894264ab2ba0bcda3e4fb6d15a61e51..2cf6197f4aa64f7b6de54bac940c9b973f505a9b 100644 (file)
--- 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 5322ec2b64fb003d97d974ab548030ec328a46e9..d07273efd1be75fed3adc309a69656751c6e1ece 100644 (file)
--- 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 ae62159e5c09b0916660fed5ea019ed852e145d7..b306b47c5b001bf5b50248c44c1d0fd8561ed5b0 100644 (file)
--- 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 1c3381a156de7d421f28665bc8471687452fb4e6..0cd8d7489ff86b2303ba99848784b56167757467 100644 (file)
--- 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 2886a540ea5e5fa616f7b3d56742b69ba62a928b..a4bbd75c8474302e3f51792e924e0e82d5ed5faa 100644 (file)
--- 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 513c76f8f98e3377094c6a925a4eaa067d5ffa8c..16121afc47874d802c0c7c9efe336e2c3726a94d 100644 (file)
--- 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 0e8baca8afbd16215a15a6e7108df9fb172c9a13..c6bcd6d84f8f1c2144695ed3fe1ae1483ffbd4e6 100644 (file)
--- 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 9fedb2b4b4df8988109cd567072549b4780cd39d..0165466709445ec42364f9ff8942c53fb0bccdf9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
@@ -13,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 3688f2302e1155e0e3146abcaa7bb2dcd7086f4f..e6185dc198c25df91b39631979a36a8711230617 100644 (file)
--- 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 32eca642ef06edb56829285b67bdf8cb26b70fbc..08c002d8f69cd6c73f0d2b5d7cb72be87df5514d 100644 (file)
--- 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 074efdeb92c449d4ca938720b2a3908695666d1d..dec9532f6ed2f4942edfbfb711d0d269e7e3c3bf 100644 (file)
--- 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 de887394381a0cfeb04e1648ba5733d61668a451..c13625949237e7436e2048608b80958c5df8e21f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
@@ -13,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 10ffcb19cfb7bdad2465c26126106f2483eb63dc..858ff41f38442d9ceae32f5342b79da66c76b1b4 100644 (file)
--- 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 82fb0c5be92d00cc380cd9421c2541f9421a1985..6fbcce25cfb1eb53e74dd8f606cfac44bef44eda 100644 (file)
--- 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 74a9d79a0f8ffdba0fd11bab1322e1f496039f3e..4d15d5a81aa88100261fc5917e769ef65f94a96c 100644 (file)
--- 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 48afc44a27cd197dd7cd1ee0c016d41bb545a972..2a0a7871338163e21259fcb0777acfcc87657448 100644 (file)
--- 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 c3fa7821afbd8360a22e842c3b5adad124907b32..f8f1d9ae167e3061433355effae1ead8b9a589b7 100644 (file)
--- 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 40fa620d116e4aac2b0d8953772b5e136e133f00..d10c6df40270aaffab248b7c24016b74cba41fdc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
@@ -13,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 239e8d3de3139b4a402364f4b90bc2d248dbea2f..480dedbaef8b716541c8578501afe56f69ccd98b 100644 (file)
--- 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 6b6a4908a4bccbc7823a2db16d34f03e8e3c5a18..184bd392d63679092dd9b1786474af7f482e9ada 100644 (file)
--- 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 544a489c1c2841fab416db79a6b4fecebf30f4ef..301e78ff0d2e425b9cc3329639bf11aaada59bd4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
@@ -13,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 9ee8ba8bc033f506f67cdf2651f01c98683113c0..c5e74554b2ef95c53e5fbaa9ab782b415b7b0d59 100644 (file)
--- 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 545dc87b36080d2b5804fc7c35285f5a9d888a51..dea21204bb09997ece4464ee534274a84428f587 100644 (file)
--- 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 2ccc23a874a56df59b8e55da2f9c7d0b072782a9..66d1507a1aa6cfd40d6d856896c2276efeacb762 100644 (file)
--- 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 32f8ce502c6a0cb9e5284da6cbaa145c0b1c1fbe..54ce4ded5a6c4b439e7a7d59c9a8a58a7b518651 100644 (file)
--- 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 f10e419c15fbbd2160cc4f71095d654b6b20aa85..065c51508e7c518166b7b8f604c595f3b7a49d24 100644 (file)
--- 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 432986711b5985fe8f98ba60a904aebefb3f5ad6..dad0d3afb0bf2d4a41e3bd336c6435c77bf9e012 100644 (file)
--- 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 f9185b98a1102cf64c11ac03808c4894ade6e219..2867a6d9f64e6c038dc70b52bba6409aeee1c88a 100644 (file)
--- 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 8823844c915c08a15c40cbcc56ad1d79ea81af1c..2b50fec3cd78c6c98bb2fe3948d8c9e80bace1cc 100644 (file)
--- 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 218991dd21463c4aee3467b7a34abd0174c34a30..9a0bce4e724ca2c53d74d1571d43a40e9509f7b6 100644 (file)
--- 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 e801854006ca868ed50302376fbb7e7b6b078694..996d5bf166a1f4a1c3f9c69245929d4324db1e29 100644 (file)
--- 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 a54979c5881b63ac0c4d376bf0cfed5b6a6e78eb..6bf6c0942c366a5f64e16964bb70076a454fb7c6 100644 (file)
--- 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 e616ddd3c64bf45a10fde567b2da3be7815050b9..c579f9370cb894a976c6a348950f9ad4be8d2984 100644 (file)
--- 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 b8442fe501ef3a8e26032c40891008ae9f31602b..7c227dd5845ac8c2a065e17d6db6b71d83b88a43 100644 (file)
--- 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 a7b5dbfb8f901aa2e5e410c932d83cf97bb055a0..6acadd8b1a2b083ae7a78130287d13bc91d18e10 100644 (file)
--- 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 8ec3d3b75baaa09945f276b49270ccbfb0304e35..0723848d78f25fa8bb303da6d13d75e5a3901d09 100644 (file)
--- 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 53f43abb95af7d049a2241bc81803a2b0d46fad2..f9208b31d10b95a6eebc2796ae5db1f1e9e684cb 100644 (file)
--- 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 3902035cf3df405222f6702c28b0801c152fb19e..5da3bd853820cead175148a4e22da131eb7d38b8 100644 (file)
--- 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 cd489cee966ddd8016c1d8c71ebb113ca24dbe49..f94e01313931fc7f2d71b8f1121c9a8a1449116b 100644 (file)
--- 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 e23f0913fad6b40a093ee952a2872422104739a1..5b9377caf8f72163f3a1fe927fa48a83a12a6fd1 100644 (file)
--- 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 107b570df29b3b6e5a50573f3b9429d0c4ae492c..a559f11ebf6c96330528508397dd1c5cae1139fb 100644 (file)
--- 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 d0fb0133d364b67fec6f0d0579e180b7be6811a9..aaeb6daf52120e37c6a83e315e532dd78901de19 100644 (file)
--- 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 ffd980747a35bb1aabc51d3af8fb554438469b97..11afa6102d17283139e4d730ade97dea152a3736 100644 (file)
--- 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 1b2d27523cddc142472985f5c9d60c5f688b7224..01f365cb43ffa461f3ccbf4d6d0dcd99747c33a7 100644 (file)
--- 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 6e64e6651eb2d30e00f3b53c5bdb8ca6c3c7c572..b507ce2427ea490b9913c6d41dac4bd561b577d3 100644 (file)
--- 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 ee6b0499495751e6694683918e6370570fa1f1a9..dd2a09a8bbe87f148aaeee62064f0e656c4f74c0 100644 (file)
--- 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 95b4a9039e546f96ec70b56fea36ecb1a96b3e1a..827769b9b1df034dfefbc7cb92f5df11eec70c94 100644 (file)
--- 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: