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 ac20bfacafe413b361a9638c27f14554cb0f458c..695414e12851865cb000454beb16ca78d5695abf 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -1,8 +1,8 @@
 - project:
     name: aaa-csit-authn
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'aaa'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,11 +29,10 @@
             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: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-