Merge "Enable Heat for {project}-csit-3node-{functionality}-{install}-{stream}"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-clustering.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 2cf6197f4aa64f7b6de54bac940c9b973f505a9b..faab686622dac1d2908c0cc1e45b98a1eab4aebd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -12,26 +12,27 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
+    # mininet image
+    # TODO: Remove mininet-image as it's deprecated in favor of vm_1_image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
+
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-