X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius-csit-genius.yaml;h=98dd8fafbb2ebe75c8b579170c765b3a1639ab47;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=42f7e4a0fd5f0f200aa41fc18b952379b32c9403;hpb=50807e03c1fc0d463f690b7e36f2f024ab3bf0af;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 42f7e4a0f..98dd8fafb 100644
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,80 +1,56 @@
 ---
 - 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:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+
     install:
       - all:
           scope: 'all'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
-    verify-karaf-version: 'karaf4'
-
-    # 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-verify
     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'
+    functionality: 'verify'
 
-    # Project branches
     stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - fluorine:
+          branch: 'master'
+
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
+    verify-karaf-version: 'karaf4'
 
     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: ' '