From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 22 Dec 2015 09:47:07 +0000 (+0100)
Subject: Make java options configurable.
X-Git-Tag: release/beryllium-sr1~238
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=50f75631b1922e8235271ed1c25a16b51e119985;p=integration%2Ftest.git

Make java options configurable.

Placed the java options to TESTTOOL_DEFAULT_JAVA_OPTIONS
Robot variable so Jenkins jobs can override them as needed.

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

diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot
index 0c5a8d45d7..a0d05abd3f 100644
--- a/csit/libraries/NetconfKeywords.robot
+++ b/csit/libraries/NetconfKeywords.robot
@@ -19,6 +19,7 @@ Resource          NexusKeywords.robot
 Resource          SSHKeywords.robot
 
 *** Variables ***
+${TESTTOOL_DEFAULT_JAVA_OPTIONS}    -Xmx1G -XX:MaxPermSize=256M
 ${DIRECTORY_WITH_DEVICE_TEMPLATES}    ${CURDIR}/../variables/netconf/device
 ${FIRST_TESTTOOL_PORT}    17830
 ${BASE_NETCONF_DEVICE_PORT}    17830
@@ -125,7 +126,7 @@ NetconfKeywords__Check_Device_Is_Up
     BuiltIn.Should_Be_Equal_As_Integers    ${count}    1
 
 Install_And_Start_Testtool
-    [Arguments]    ${device-count}=10    ${debug}=true    ${schemas}=none    ${options}=${EMPTY}
+    [Arguments]    ${device-count}=10    ${debug}=true    ${schemas}=none    ${tool_options}=${EMPTY}    ${java_options}=${TESTTOOL_DEFAULT_JAVA_OPTIONS}
     [Documentation]    Install and run testtool. Also arrange to collect its output into a log file.
     ...    When the ${schemas} argument is set to 'none', it signifies that
     ...    there are no additional schemas to be deployed, so the directory
@@ -135,7 +136,7 @@ Install_And_Start_Testtool
     ${filename}=    NexusKeywords.Deploy_Test_Tool    netconf/netconf-testtool
     ${schemas_option}=    NetconfKeywords__Deploy_Additional_Schemas    ${schemas}
     # Start the testtool
-    ${command}    BuiltIn.Set_Variable    java -Xmx1G -XX:MaxPermSize=256M -jar ${filename} ${options} --device-count ${device-count} --debug ${debug} ${schemas_option}
+    ${command}    BuiltIn.Set_Variable    java ${java_options} -jar ${filename} ${tool_options} --device-count ${device-count} --debug ${debug} ${schemas_option}
     BuiltIn.Log    Running testtool: ${command}
     SSHLibrary.Write    ${command} >testtool.log 2>&1
     # Wait for the testtool to boot up.