Add more memory to distribution sanity test

[releng/builder.git] / jjb / integration / distribution / distribution-check-bootup.sh

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 36bbfd705d6075366f51cfdc7768e4bf5199f073..e3147f335e64e9ca9a2161064aa92606f4ce3906 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -1,8 +1,13 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
 if [[ ! -z "${CONTROLLERFEATURES}" ]]; then
     ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}"
+else
+    ACTUALFEATURES="odl-integration-all"
+fi
+
+if [[ "${JOB_NAME}" == *"distribution-sanity"* ]]; then
+    CONTROLLERMEM="4096m"
+else
+    CONTROLLERMEM="3072m"
 fi
 
 echo "Kill any controller running"
@@ -55,7 +60,10 @@ cat "${MEMCONF}"
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
+if [ "$JDKVERSION" == 'openjdk11' ]; then
+    echo "Preparing for JRE Version 11"
+    JAVA_HOME="/opt/jdk-11"
+elif [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java