X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=061a0b5bcdbff1455cb245155d9fb4fabad1b2ad;hb=39c037f1cdedc75aa70ccfd7f2c2440066101245;hp=e7a0de033bc6d4eebb31ddfbe8ecbd96cab2dae1;hpb=7de9f169f9c12a041b8ace55aaac507f951d7d3f;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index e7a0de033..061a0b5bc 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,7 +11,7 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk7'
+            jdk: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -30,6 +30,8 @@
                 l2switch-csit-1node-scalability-all-{stream},
                 lispflowmapping-csit-1node-msmr-only-{stream},
                 lispflowmapping-csit-1node-msmr-all-{stream},
+                nemo-csit-1node-engine-all-{stream},
+                nemo-csit-1node-engine-only-{stream},
                 nic-csit-1node-basic-all-{stream},
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -56,8 +58,7 @@
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
                 vpnservice-csit-1node-vpnservice-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream}
+                vtn-csit-1node-manager-only-{stream}
 
         - beryllium:
             branch: 'stable/beryllium'
@@ -80,6 +81,8 @@
                 l2switch-csit-1node-scalability-all-{stream},
                 lispflowmapping-csit-1node-msmr-only-{stream},
                 lispflowmapping-csit-1node-msmr-all-{stream},
+                nemo-csit-1node-engine-all-{stream},
+                nemo-csit-1node-engine-only-{stream},
                 nic-csit-1node-basic-all-{stream},
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -108,8 +111,7 @@
                 vpnservice-csit-1node-vpnservice-all-{stream},
                 vtn-csit-1node-manager-only-{stream},
                 vtn-csit-1node-manager-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream},
-                vtn-csit-1node-coordinator-all-{stream}
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
@@ -154,8 +156,7 @@
                 vpnservice-csit-1node-vpnservice-all-{stream},
                 vtn-csit-1node-manager-li-only-{stream},
                 vtn-csit-1node-manager-li-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream},
-                vtn-csit-1node-coordinator-all-{stream}
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-helium:
             branch: 'stable/helium'
@@ -271,7 +272,8 @@
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # {jdk} is from releng-defaults
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -340,7 +342,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -352,6 +354,8 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
+                  JDKVERSION=$JDKVERSION
+
     publishers:
         - email-notification:
             email-prefix: '[integration]'