Adding odl-usecplugin-aaa and odl-usecplugin-openflow features to usecplugin-csit...

[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 a16717a2b7131f28c8bcf13855340e73a7f40e72..a611bead652c8194cc627bcd108bade72fd72451 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -14,8 +14,10 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,11 +26,11 @@
             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}'
+    trigger-jobs: 'openflowplugin-distribution-{stream},usecplugin-distribution-{stream}'