Merge "Add --removekeywords wuks option to pybot command"

[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 ca41b780c725588815b893fba84e9cb5f8faa9c8..1e78e755ccade34c9ae1735fd2ef00e230268e3d 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -12,10 +12,17 @@
 
     # Project branches
     stream:
-#        - beryllium:
-#            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,5 +36,6 @@
     # Robot custom options
     robot-options: ''
 
+
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'