Merge "Use only Boron for netvirt-legacy patch test"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index 9c6c360861ca4e879087fbd1fe2e31c455a0e657..6f9610a22f1fe9490397aed9484f19249a32e074 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: openflowplugin-csit-flow-services-frs
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,23 +12,33 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync,odl-openflowplugin-app-table-miss-enforcer'
+    install-features: >
+        odl-restconf,
+        odl-openflowplugin-app-config-pusher,
+        odl-openflowplugin-app-topology,
+        odl-openflowplugin-app-forwardingrules-sync,
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options.
     # We need this delay to verify proper functionality. THIS HAS TO BE REMOVED BEFORE FRS GETS RELEASED.
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221