Merge "Fix for Pike/Queens Jobs"

[releng/builder.git] / jjb / vtn / vtn-csit-manager.yaml

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 59f9284e22b892dc943b1f4ad8e5489d25861dd6..fd04de777fe0916e23cf9b620ad5e696a2e828a0 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-manager
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
@@ -13,15 +13,14 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -34,4 +33,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847