Merge "Switch the csit-verify-3node to use job prefix"

[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 d311dc6f6d7432cd05180e71a53c5e88efec3952..8130af298d2aca46e36f6ae51a5c483cc817f933 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,33 +1,39 @@
+---
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'flow-services'
+    functionality:
+      - flow-services
+      - gate-flow-services
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-        - beryllium:
-            branch: 'stable/beryllium'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: 'karaf3'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
+
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: >
+        odl-openflowplugin-flow-services-rest,
+        odl-openflowplugin-app-table-miss-enforcer,
+        odl-openflowplugin-nxm-extensions
 
     # Robot custom options
-    robot-options: '-e adsal'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    robot-options: ''