Make Java version for CSIT jobs configurable

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

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index 3a495b55e8c4d630cd321711f9bf41b08b42aa75..266f9a5a2b04414a036bb886d0691850550394a2 100644 (file)
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -1,9 +1,10 @@
 - project:
     name: integration-csit-basic
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'integration'
@@ -13,10 +14,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -24,10 +30,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-restconf'
 
@@ -35,5 +37,9 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},aaa-distribution-{stream},l2switch-distribution-{stream},ovsdb-distribution-{stream},vtn-distribution-{stream},lispflowmapping-distribution-{stream},integration-distribution-merge-{stream}'
-
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        aaa-distribution-{stream},
+        integration-distribution-merge-{stream}