X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=46315bb4b09d9bdde34ed71345342177d91a1428;hb=bad93cff627169b7d34c2a315bbf130ecbfd1215;hp=3d3a63b97ef71640c34c3141a02ecf8022aad854;hpb=5cd1769e4fe77fb73181c8e8f3725760d588a7ca;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 3d3a63b97..46315bb4b 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -2,8 +2,8 @@
 - project:
     name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
     project: 'genius'
 
@@ -13,50 +13,24 @@
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
 
+    testplan: '{project}-{functionality}.txt'
+
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
-
-    tools_system_count: 3
-
-    install-features: 'odl-genius-rest'
-
-
-- project:
-    name: genius-csit-genius-carbon-nitrogen
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
-
-    project: 'genius'
-
-    functionality:
-      - 'upstream'
-      - 'gate'
-
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    testplan: 'genius-carbon-nitrogen.txt'
-
-    install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     tools_system_count: 3
 
     install-features: 'odl-genius-rest'
-
+    robot-options: '-v FAIL_ON_EXCEPTIONS:False'
 
 - project:
     name: genius-csit-genius-verify
@@ -76,11 +50,9 @@
     verify-branch: 'stable/oxygen'
     verify-karaf-version: 'karaf4'
 
-    testplan: 'genius-genius.txt'
-
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     tools_system_count: 3