Merge "Fix genius CSIT jobs"

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index fea7ca0358dc170ed3f8c880b8b274343d3a105f..1d64f2e5d8273dc22ed285fec147bcc1a0c348b0 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,12 +1,9 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
 
     # The project name
     project: 'genius'
@@ -23,6 +20,39 @@
     stream:
       - oxygen:
           branch: 'master'
+    install:
+      - all:
+          scope: 'all'
+
+    # Mininet configuration
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+
+    # Features to install
+    install-features: 'odl-genius-rest'
+
+    # Robot custom options
+    robot-options: ' '
+
+- project:
+    name: genius-csit-genius-{stream}
+    jobs:
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
+
+
+    # The project name
+    project: 'genius'
+
+    # The functionality under test
+    functionality:
+      - 'upstream'
+      - 'gate'
+
+    # Project branches
+    stream:
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon: