X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=5464d411073671d7790f5215f5832348cd576b59;hb=92edcb7273183a92cc329b2d9d016b41d6d896e1;hp=195876e682dbe82768d9b56f2b1133b957e5a30c;hpb=d923faff8b1fc8a645f31076de013326b3117e00;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 195876e68..5464d4110 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},
@@ -268,7 +268,8 @@
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # {jdk} is from releng-defaults
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -337,7 +338,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -349,6 +350,8 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
+                  JDKVERSION=$JDKVERSION
+
     publishers:
         - email-notification:
             email-prefix: '[integration]'