X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=7fcab6c0bf70406fea718ae63b19856c3071a37a;hb=ac68c247ed4b83393f82f2b5ea4e025b71942d40;hp=fa777e6113aed39b7004b4a5e0f2439780d2f388;hpb=1cf091979847e0772201d46a668e0a90108a0215;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index fa777e611..7fcab6c0b 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,76 +1,82 @@
 ---
 - project:
-    name: genius-csit-genius-oxygen
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
-          schedule: ''
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
+
     install:
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # Features to install
     install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
 
 - project:
-    name: genius-csit-genius-{stream}
+    name: genius-csit-genius-carbon-nitrogen
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
 
-    # Project branches
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+
+    testplan: 'genius-carbon-nitrogen.txt'
 
     install:
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # 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'