Merge "Add MEMCONF as a function var to set_java_vars"

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 3c083c5e51a09a5dde3dad5a88616f0ef632a925..605cd8f0ac9ac8a49a8d2f16d6053681efd28c02 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -36,25 +36,27 @@ 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
+    local -r java_home=$1
+    local -r controllermem=$2
+    local -r memconf=$3
 
-    echo "Configure java home and max memory..."
-    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${JAVA_HOME}"'}%g' ${MEMCONF}
-    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM='"${CONTROLLERMEM}"'/g' ${MEMCONF}
-    echo "cat ${MEMCONF}"
-    cat ${MEMCONF}
+    echo "Configure\n    java home: ${java_home}\n    max memory: ${controllermem}\n    memconf: ${memconf}"
+
+    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${java_home}"'}%g' ${memconf}
+    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM='"${controllermem}"'/g' ${memconf}
+    echo "cat ${memconf}"
+    cat ${memconf}
 
     echo "Set Java version"
-    sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
-    sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
+    sudo /usr/sbin/alternatives --install /usr/bin/java java ${java_home}/bin/java 1
+    sudo /usr/sbin/alternatives --set java ${java_home}/bin/java
     echo "JDK default version ..."
     java -version
 
     echo "Set JAVA_HOME"
-    export JAVA_HOME="${JAVA_HOME}"
+    export JAVA_HOME="${java_home}"
     # shellcheck disable=SC2037
-    JAVA_RESOLVED=$(readlink -e "${JAVA_HOME}/bin/java")
+    JAVA_RESOLVED=$(readlink -e "${java_home}/bin/java")
     echo "Java binary pointed at by JAVA_HOME: ${JAVA_RESOLVED}"
 } # set_java_vars()
 

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index 9e0d0662f443cee29cd5d965a0daca85386e3bb2..ee18f254061a97139c1158faee4ee820f26b3810 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}" "${CONTROLLERMEM}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
 
 # 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 c222ed2fc184b6680090b5103ee3b0fd6de050cc..b3da33674beb45cbc8bfa469e0394a2fc9162301 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}" "${CONTROLLERMEM}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
 
 echo "Listing all open ports on controller system..."
 netstat -pnatu