Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / vpnservice / vpnservice-csit-vpnservice.yaml

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index db226cd245b828a999b5e13d56f23400a7f59ccb..ffd980747a35bb1aabc51d3af8fb554438469b97 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -1,8 +1,8 @@
 - project:
     name: vpnservice-csit-vpnservice
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vpnservice'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -23,6 +28,10 @@
         - all:
             scope: 'all'
 
+    # Mininet configuration
+    mininet-image: 'rk-f21-mininet'
+    mininet-vms: 2
+
     # Features to install
     install-features: 'odl-vpnservice-core'
 
@@ -31,4 +40,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vpnservice-distribution-{stream}'
-