Correctly export JAVA_OPTS for testing
Change-Id: Iac2eef55145e2008771581e5003e5b21ad7d1c6c
diff --git a/jjb/OnosSystemTest/cho-init.sh b/jjb/OnosSystemTest/cho-init.sh
index 7c0e11f..f4e408a 100644
--- a/jjb/OnosSystemTest/cho-init.sh
+++ b/jjb/OnosSystemTest/cho-init.sh
@@ -44,9 +44,9 @@
echo -e "\n##### set jvm heap size to 8G #####"
-echo ${ONOSJVMHeap}
+echo ${ONOSJAVAOPTS}
-inserted_line="export JAVA_OPTS="${ONOSJVMHeap}""
+inserted_line="export JAVA_OPTS="${ONOSJAVAOPTS}""
sed -i "s/bash/bash\n$inserted_line/" ~/onos/tools/package/bin/onos-service
echo "##### Check onos-service setting..... #####"
@@ -55,4 +55,4 @@
export JAVA_HOME=/usr/local/java/jdk1.8.0_51
#Copy cell file over
-cp ~/choTest3 ~/onos/tools/test/cells/
\ No newline at end of file
+cp ~/choTest3 ~/onos/tools/test/cells/
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 08b6e78..e29d4f4 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -343,9 +343,9 @@
This parameter is also use to trigger where the test results to be posted
- string:
- name: 'ONOSJVMHeap'
- default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G}}\""
- description: 'onos cell jvm heap size setting'
+ name: 'ONOSJAVAOPTS'
+ default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G -Dkaraf.log.console=INFO -Dds.lock.timeout.milliseconds=10000}}\""
+ description: 'onos cell JAVA_OPTS setting'
- string:
name: 'TestONBranch'
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 6dd607c..68fb3a6 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -153,9 +153,9 @@
description: "ONOS and TestON versions to run on."
- string:
- name: ONOSJVMHeap
- default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G}}\""
- description: 'ONOS cell JVM heap size setting.'
+ name: ONOSJAVAOPTS
+ default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G -Dkaraf.log.console=INFO -Dds.lock.timeout.milliseconds=10000}}\""
+ description: 'ONOS cell JAVA_OPTS setting.'
- string:
name: ONOSTag