Disable Lithium jobs

[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 55fabdebdb02629ee037cf462d6b5d12a4775a4b..46ecafe7e234713fa8bfa11a5dd7360be9697aa2 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,19 @@
 
     # Project branches
     stream:
-        - master:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
+            disabled: true
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,8 +33,7 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-image: 'rk-f21-mininet'
-    mininet-vms: 1
+    mininet-vms: 2
 
     # Features to install
     install-features: 'odl-vpnservice-core'
@@ -34,5 +42,4 @@
     robot-options: ' '
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vpnservice-distribution-{stream}'
-
+    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vpnservice-distribution-{stream}'