Rework the way Java version is set in CSIT jobs

[releng/builder.git] / jjb / aaa / aaa-csit-authn.yaml

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index f9e669913643e29d2e1feb026c96b575a561de08..695414e12851865cb000454beb16ca78d5695abf 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -2,7 +2,7 @@
     name: aaa-csit-authn
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'aaa'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-aaa-api,odl-aaa-authn,odl-aaa-authz,odl-aaa-sssd-plugin,odl-aaa-netconf-plugin'
+    install-features: 'odl-restconf'
 
     # Robot custom options
     robot-options: ''