Merge "Mention OS_CLOUD as a variable is significant"

[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 64bcee09448c5497b4ae6a1ad27cc2266c7791a1..73641de366e741a9ca62eef9475251baa68eae10 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -1,8 +1,8 @@
+---
 - project:
     name: openflowplugin-csit-flow-services-frs
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,22 +12,31 @@
 
     # 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'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
 
     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'
+    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
-    robot-options: ''
+    # 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'
 
-    # 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