commit bd4fb255d4cb8b3d9fc11806322b20df4af6e77a
author You Wang <you@opennetworking.org> Thu Jan 03 20:34:19 2019 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Thu Jan 03 20:34:19 2019 +0000
tree caf70e8eac6f56ad64cfd0114ecaefbbf257c78f
parent 25e3bcc66c9e611d1183f4e0a23e61d4207c305d
parent 8e4f4c0f636217e2d27ce9aebaee3ba33d54b246

Merge "Replace ONOSJVMHeap with ONOSJAVAOPTS"

TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index be3bb2b..d309f44 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -385,7 +385,7 @@
                     def fileContents = ""
                     node( testMachine ) {
                         withEnv( [ 'ONOSBranch=' + prop[ "ONOSBranch" ],
-                                   'ONOSJVMHeap=' + prop[ "ONOSJVMHeap" ],
+                                   'ONOSJAVAOPTS=' + prop[ "ONOSJAVAOPTS" ],
                                    'TestONBranch=' + prop[ "TestONBranch" ],
                                    'ONOSTag=' + prop[ "ONOSTag" ],
                                    'WikiPrefix=' + prop[ "WikiPrefix" ],

TestON/JenkinsFile/dependencies/TriggerFuncs.groovy

diff --git a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
index 2ca4f72..effc766 100644
--- a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
@@ -135,7 +135,7 @@
             echo "TestONBranch=''' + test_branch + '''" >> /var/jenkins/TestONOS.property
             echo "ONOSTag=''' + onosTag + '''" >> /var/jenkins/TestONOS.property
             echo "WikiPrefix=''' + wiki + '''" >> /var/jenkins/TestONOS.property
-            echo "ONOSJVMHeap=''' + env.ONOSJVMHeap + '''" >> /var/jenkins/TestONOS.property
+            echo "ONOSJAVAOPTS=''' + env.ONOSJAVAOPTS + '''" >> /var/jenkins/TestONOS.property
             echo "Tests=''' + tests + '''" >> /var/jenkins/TestONOS.property
             echo "postResult=''' + postResult + '''" >> /var/jenkins/TestONOS.property
             echo "manualRun=''' + manually_run + '''" >> /var/jenkins/TestONOS.property
@@ -213,8 +213,8 @@
         git branch
         git log -1 --decorate
         echo -e "\n##### set jvm heap size to 8G #####"
-        echo ${ONOSJVMHeap}
-        inserted_line="export JAVA_OPTS=\"\${ONOSJVMHeap}\""
+        echo ${ONOSJAVAOPTS}
+        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..... #####"
         cat ~/onos/tools/package/bin/onos-service