Merge "Remove openflowjava carbon jobs"

[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 c7c4bd9a3d17beef46f586398f449e591c182dda..7fcab6c0bf70406fea718ae63b19856c3071a37a 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,39 +1,82 @@
+---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
+      - 'tdd-wip':
+          testplan: '{project}-tdd-wip.txt'
 
-    # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
-    # Mininet configuration
-    tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20161110-2310
+    tools_system_count: 3
 
-    # Features to install
-    install-features: 'odl-genius-ui'
+    install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'
+- project:
+    name: genius-csit-genius-carbon-nitrogen
+    jobs:
+      - inttest-csit-1node
+      - inttest-csit-3node
+
+    project: 'genius'
+
+    functionality:
+      - 'upstream'
+      - 'gate'
+
+    stream:
+      - nitrogen:
+          branch: 'stable/nitrogen'
+
+    testplan: 'genius-carbon-nitrogen.txt'
+
+    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'
+
+    install:
+      - all:
+          scope: 'all'
+
+    tools_system_count: 3
+
+    install-features: 'odl-genius-rest'