X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=05e7b801762f01edb2b7ac57e82a2a9ef6aa8feb;hb=316141c3a3e59d39c9a5b1e8d472be2e36b12556;hp=7fcab6c0bf70406fea718ae63b19856c3071a37a;hpb=3bf85d285e5e15c596d2b39ea733a11c2971889a;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 7fcab6c0b..05e7b8017 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -2,81 +2,35 @@
 - project:
     name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
-    project: 'genius'
+    project: "genius"
 
     functionality:
-      - 'upstream'
-      - 'gate'
-      - 'tdd-wip':
-          testplan: '{project}-tdd-wip.txt'
+      - "upstream"
+      - "gate"
+      - "tdd-wip":
+          testplan: "{project}-tdd-wip.txt"
 
-    stream:
-      - fluorine:
-          branch: 'master'
-      - 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'
-
-    testplan: 'genius-carbon-nitrogen.txt'
-
-    install:
-      - all:
-          scope: 'all'
-
-    tools_system_count: 3
-
-    install-features: 'odl-genius-rest'
-
-
-- project:
-    name: genius-csit-genius-verify
-    jobs:
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
-    project: 'genius'
-
-    functionality: 'verify'
+    testplan: "{project}-{functionality}.txt"
 
     stream:
-      - fluorine:
-          branch: 'master'
-
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
-    verify-karaf-version: 'karaf4'
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: "only"
 
     tools_system_count: 3
 
-    install-features: 'odl-genius-rest'
+    install-features: "odl-genius-rest"
+    robot-options: "-v FAIL_ON_EXCEPTIONS:False"