X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=33e6dbbd101ba30a24fe48df98e76601f423d0d4;hb=9712aebd07d323d91d7e9f7f1392ae7768338644;hp=0bbc7e6206dddec65428b71cbd1f6b7fa7b4f2fa;hpb=d9ee132a7c720d66270854daf03693e2b27d77e1;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 0bbc7e620..33e6dbbd1 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,47 +1,83 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
 
+    project: 'genius'
+
+    functionality:
+      - '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
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
 
-    # Project branches
     stream:
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          branch: 'stable/nitrogen'
       - 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'
 
-    # Mininet configuration
-    tools_system_count: 2
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+    tools_system_count: 3
 
-    # Features to install
     install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
+
+- 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'