Merge "Rework the way Java version is set in CSIT jobs"

[releng/builder.git] / jjb / vtn / vtn-csit-manager.yaml

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index d0f0dd620cbd45dc102809cd49298ad8dd33a1f1..827769b9b1df034dfefbc7cb92f5df11eec70c94 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -2,7 +2,7 @@
     name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vtn'
@@ -12,10 +12,12 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only: