Make Java version for CSIT jobs configurable

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

diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
index 364c8bdf061d5d3be657f50b66c281e807f2bb07..7bd9c05e6fbb36a04cfbaeb7e8400fa4d967ac94 100644 (file)
--- a/jjb/integration/integration-csit-basic-stable-helium.yaml
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -2,8 +2,8 @@
     name: integration-csit-basic-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'integration'
@@ -15,6 +15,7 @@
     stream:
        - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -29,5 +30,9 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},integration-distribution-merge-{stream}'
-
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        aaa-distribution-{stream},
+        integration-distribution-merge-{stream}