Merge "Switch the csit-verify-3node to use job prefix"

[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 863f802e3277ee1aafd9c9f6672f3fad5710615b..5e01210a39846aa87e6ad0205e20f356f6684f92 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -3,9 +3,9 @@
     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}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
 
 
     # The project name
@@ -20,13 +20,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -35,7 +32,7 @@
 
     # Mininet configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Features to install
     install-features: 'odl-genius-rest'