Remove lithium jobs

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

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index e8f3fe526e6560f32992bdfb32c8c29dbd7a990f..7874dd4083d89d8241c0fbd98e032e6d2858c29d 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -12,12 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -25,7 +28,7 @@
         - all:
             scope: 'all'
 
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23'
+    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
 
     # Features to install
     install-features: 'odl-lacp-ui'
@@ -34,4 +37,4 @@
     robot-options: ' '
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'
+    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'