Merge "Add xz option to use more threads"

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 4b6a313e990ebb2a1550cb886c857a17a56be3fa..3c083c5e51a09a5dde3dad5a88616f0ef632a925 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -37,6 +37,7 @@ print_common_env
 # Setup JAVA_HOME and MAX_MEM Value in ODL startup config file
 function set_java_vars() {
     local JAVA_HOME=$1
+    local CONTROLLERMEM=$2
 
     echo "Configure java home and max memory..."
     sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${JAVA_HOME}"'}%g' ${MEMCONF}

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index ecc941a5b16ca3eff5d4e84687e4e9a3268f164e..9e0d0662f443cee29cd5d965a0daca85386e3bb2 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -91,7 +91,7 @@ fi
 
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-set_java_vars "${JAVA_HOME}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}"
 
 # Copy shard file if exists
 if [ -f /tmp/custom_shard_config.txt ]; then

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 84fb75517c20ba366f4f5dc172305269af3f85e2..c222ed2fc184b6680090b5103ee3b0fd6de050cc 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -82,7 +82,7 @@ cat ${CUSTOMPROP}
 
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-set_java_vars "${JAVA_HOME}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}"
 
 echo "Listing all open ports on controller system..."
 netstat -pnatu