Merge "Update validate autorelease projects for neon"

[releng/builder.git] / jjb / genius / genius-csit-genius.yaml

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 5e01210a39846aa87e6ad0205e20f356f6684f92..184d1d07cbfc9dd7483c36771a2684ea46ffb43f 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,41 +1,61 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
+      - 'tdd-wip':
+          testplan: '{project}-tdd-wip.txt'
+
+    testplan: '{project}-{functionality}.txt'
 
-    # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
-    # 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-options: '-v FAIL_ON_EXCEPTIONS:False'
 
-    # 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:
+      - only:
+          scope: 'only'
+
+    tools_system_count: 3
+
+    install-features: 'odl-genius-rest'