Merge "Add jobs for VTN with Openstack Newton"

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

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index ef4175b7e7d942fe40191b5bca5085894db66490..f1480d61c289c431c467d6244d73481f6229c688 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -2,7 +2,7 @@
     name: vtn-csit-vtn-coordinator
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'vtn'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,8 +29,11 @@
     # Features to install
     install-features: 'odl-vtn-manager-rest'
 
+
     # Robot custom options
     robot-options: ''
 
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'