Fix genius CSIT 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 53c2d7ab125a6cdb649024653460ba0799abd670..1d64f2e5d8273dc22ed285fec147bcc1a0c348b0 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,43 +1,74 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{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'
+          schedule: ''
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+    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}
+    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'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Mininet configuration
-    tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Features to install
-    install-features: 'odl-genius-ui'
+    install-features: 'odl-genius-rest'
 
     # Robot custom options
     robot-options: ' '