Rename genius jobs to use gate and upstream

[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 dadc6219884ba0b78b714c608c4385c031e95725..68a31279410b8212b3f7ae38ae789dbbf35f54ee 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -2,23 +2,33 @@
 - project:
     name: genius-csit-genius
     jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
       - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-verify-3node-{functionality}'
+
 
     # The project name
     project: 'genius'
 
     # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
@@ -28,7 +38,7 @@
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170210-0414
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
 
     # Features to install
     install-features: 'odl-genius-ui'