Bug 2625: Revert CSIT jobs to use openjdk7 for now

Also fixed the fact that "jdk" field was not defined
for every stream in integration-test-jobs.

Making java version for CSIT jobs requires more intrusive change.

Change-Id: Id741c9934fc864342d4df35b37b6453a446bb4de
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 176c0d4aa196d71904cc1fd0aa06b442e1f32ae0..a1e9f075c893d4cc3d63e6002ae4cacbed6f5ba8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,7 +11,7 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -61,6 +61,7 @@
 
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -110,6 +111,7 @@
 
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -153,6 +155,7 @@
 
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},