Merge "Remove centos/fedora mininet configuration"

[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 10dfabb441fb169538f11f0e0bfa27afbc1fbd0e..d427b49b562c2ca70f28f70759e442d42a876cc5 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,11 +28,10 @@
         - all:
             scope: 'all'
 
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170210-0414
+
     # Features to install
     install-features: 'odl-lacp-ui'
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'