X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=c46ed7ed0aca412423aa41acec79cf348a751600;hb=d4217fcc0ced511ebf4e2e8bb6a021dbce2a58ef;hp=d137efcbbb77d28eb069c4fc8508f64a7c335f48;hpb=df88ab263cf33b9b1ef0675093ab99d5e2255b6f;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index d137efcbb..c46ed7ed0 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,39 +1,85 @@
+---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
+      - 'tdd-wip':
+          testplan: '{project}-tdd-wip.txt'
 
-    # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
-    mininet-vms: 2
+    tools_system_count: 3
 
-    # 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}'
+- 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'
+
+    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'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
+    verify-karaf-version: 'karaf4'
+
+    install:
+      - all:
+          scope: 'all'
+
+    tools_system_count: 3
+
+    install-features: 'odl-genius-rest'