From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 12 Feb 2016 15:20:06 +0000 (+0100)
Subject: Add odl-clustering-test-app to verify-library csit job
X-Git-Tag: release/beryllium~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=d2acfa1c8d86318f9be5b736c63c76f395988924

Add odl-clustering-test-app to verify-library csit job

Needed by https://git.opendaylight.org/gerrit/33987
Timeout for Bug 4220 check set to 10 seconds.

Also, Use Java7 for the job, as it uses Beryllium snapshot builds.

Change-Id: If616a5cfd943b0d65450ff6d3f306caf10bd2703
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 5bdbca521..3da167f62 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -284,19 +284,18 @@
             controller-scope: 'only'
         - integration-controller-features:
             controller-features: >
+                odl-clustering-test-app,
                 odl-openflowplugin-flow-services-ui,
                 odl-bgpcep-pcep,
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-e adsal'
+            test-options: '-e adsal -v TIMEOUT_BUG_4220:10s'
         - integration-test-plan:
             test-plan: 'test-libraries.txt'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
-        - integration-jdk-version:
-            # {jdk} is from releng-defaults
-            jdkversion: '{jdk}'
+        # TODO: Use integration-jdk-version macro when switching to Boron
 
     scm:
         - integration-gerrit-scm: