Clean up genius csit yaml

Change-Id: I0601a6d2c7e62aedb7ce0a8f391744820f103608
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 77d08b0d780fd61331505cb8d219410daf6242b9..33e6dbbd101ba30a24fe48df98e76601f423d0d4 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,58 +1,45 @@
 ---
 - 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'
@@ -60,6 +47,29 @@
           branch: 'stable/carbon'
           karaf-version: karaf3
 
+    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'
@@ -68,12 +78,6 @@
       - 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: ' '