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

[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 3248ac413b19ccbadd0e389de0115d252dc9489e..e9efdf10f64478c7a694a2dfa1022200c7fba86f 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -1,8 +1,9 @@
+---
 - 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'
@@ -12,18 +13,17 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
@@ -31,5 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847