Remove 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 ffd980747a35bb1aabc51d3af8fb554438469b97..1f627567b233ffd12de5b4dc07301fcac03fb3a2 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,7 +29,6 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-image: 'rk-f21-mininet'
     mininet-vms: 2
 
     # Features to install
@@ -39,4 +38,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}'