From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Fri, 2 Sep 2016 15:46:33 +0000 (+0000)
Subject: Merge "Reduce maximal size of karaf.log to fit in new VMs"
X-Git-Tag: release/boron~40
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f50b9f9d019ae88a81afe4c639216f60794a3acc;hp=b96110b4b08355cd2440555d99f53135293956ea;p=releng%2Fbuilder.git

Merge "Reduce maximal size of karaf.log to fit in new VMs"
---

diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh
index 20ed5a914..bdb4eb2f7 100644
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -75,7 +75,7 @@ echo "Configuring the log..."
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
 sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' \${LOGCONF}
 # FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index db54ed6f6..e5f7fa9d7 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -22,7 +22,7 @@ echo "Configuring the log..."
 LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
 sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
 # FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' ${LOGCONF}
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
 cat ${LOGCONF}
 
 echo "Configure the repos..."
diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 56f8ddf9b..53dbb002d 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -56,7 +56,7 @@ echo "Configuring the log..."
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
 sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' \${LOGCONF}
 # FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
 echo "Configure java home and max memory..."