Merge "move network id to local jenkins configuration managed files"

[releng/builder.git] / jjb / usecplugin / usecplugin-csit-basic.yaml

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 1b7da38622d8d4af9e75d5ab35b4843818b3a95b..e902519fb70a36cd132b22600fc6b67017a21d40 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -12,8 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -22,11 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf'
+    install-features: 'odl-restconf,odl-usecplugin-aaa,odl-usecplugin-openflow'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowplugin-distribution-{stream},usecplugin-distribution-{stream}'
-