X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=2497d827cc6a1663deb395cc611baefbcca16ee0;hb=refs%2Fchanges%2F97%2F62297%2F1;hp=c7c4bd9a3d17beef46f586398f449e591c182dda;hpb=db6f3db7605863035e0d18b555ca9bcdb5b70c49;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index c7c4bd9a3..2497d827c 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,39 +1,48 @@
+---
 - project:
     name: genius-csit-genius
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-verify-3node-{functionality}'
+
 
     # The project name
     project: 'genius'
 
     # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20161110-2310
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
-    install-features: 'odl-genius-ui'
+    install-features: 'odl-genius-rest'
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'