Merge "move heat-stack delete to include shell script"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index e7ee3c5d9acd05cd4a869e05b882f77a64b687b3..208aef4c22af135c519fc89ea12701f636388e5b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -12,12 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     install:
         - only:
@@ -26,10 +26,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    # mininet image
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300