Merge "Enhance 6Wind quagga image on ubuntu16 & centos7"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
index c09c26407d174f6acab2078e17172c1b9ba8ba01..1b29b0b1e377db1cac47b873e148b04ed26143e0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: openflowplugin-csit-flow-services-old
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,15 +12,16 @@
 
     # Project branches
     stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
@@ -28,4 +30,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300