Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-01-18 04:05:18 -0500
committerSravan Kumar Lakkimsetti2017-01-18 04:06:38 -0500
commit3c2117cf08fe2b8d245dcf7b125580d8fed49b29 (patch)
tree476e49e2b2541f424d08552feefb88fb163815d3
parent33020bfb5f35568e694220cc14950f7da8a9b92c (diff)
downloadeclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.tar.gz
eclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.tar.xz
eclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.zip
Bug 510612 - Use separate temp directory for Maven
operations defined by MAVEN_TMP_DIR Change-Id: I537312eaa52ddb539f86cbece94659b21a9afee7 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rwxr-xr-xproduction/build-functions.shsource14
-rw-r--r--production/build_eclipse_org.shsource5
-rwxr-xr-xproduction/miscToolsAndNotes/xslUtilityScripts/upVersionParents.sh4
3 files changed, 19 insertions, 4 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 3dfbf9d3..18c1dd34 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -372,6 +372,9 @@ fn-maven-build-aggregator ()
MARGS="$MARGS ${MAVEN_BREE}"
+ export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
+ mkdir -p ${MAVEN_TMP_DIR}
+
# Here we count on $BUILD_TYPE being exported. TODO: make parameter later?
if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]]
then
@@ -425,7 +428,7 @@ fn-maven-build-aggregator ()
clean verify \
-DskipTests=true \
-Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
- -Dtycho.debug.artifactcomparator \
+ -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
-Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \
-DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
rc=$?
@@ -599,15 +602,22 @@ fn-pom-version-updater ()
echo "DEBUG: DEBUG: $DEBUG"
echo "DEBUG: QUIET: $QUIET"
echo "DEBUG: MARGS: $MARGS"
+
+ export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
+ mkdir -p ${MAVEN_TMP_DIR}
+
# fail fast if not set up correctly
rc=$(fn-check-dir-exists TMP_DIR)
checkForErrorExit "$rc" "$rc"
+ rc=$(fn-check-dir-exists MAVEN_TMP_DIR)
+ checkForErrorExit "$rc" "$rc"
+
report=${TMP_DIR}/pom_${BUILD_ID}.txt
pushd "$REPO_DIR"
mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \
org.eclipse.tycho:tycho-versions-plugin:0.26.0:update-pom \
- -Dmaven.repo.local=$LOCAL_REPO \
+ -Dmaven.repo.local=$LOCAL_REPO -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
-DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE"
RC=$?
if [[ $RC != 0 ]]
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 62938fe5..96f019f0 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -77,12 +77,15 @@ export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest}
export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.6}
# we "add to" ANT_OPTS, since Hudson may define some required values
export ANT_OPTS="${ANT_OPTS} -Dbuild.sysclasspath=ignore -Dincludeantruntime=false"
+# use separate temp dir for maven like RAMDISK
+export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
+mkdir -p ${MAVEN_TMP_DIR}
#
# remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden)
# for other VMs or the VM might fail to start due to unrecognized -XX option.
# Normally should not use -Declipse.p2.mirrors=false, especially on a regular basis.
# Lower mx since less needed with Tycho 0.23.1. But, still higher than our previous 4G, since we do use near 4G.
-export MAVEN_OPTS=${MAVEN_OPTS:--Xms2048m -Xmx5120m -Djava.io.tmpdir=${TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}}
+export MAVEN_OPTS=${MAVEN_OPTS:--Xms2048m -Xmx5120m -Djava.io.tmpdir=${MAVEN_TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}}
export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.3.3/bin}
diff --git a/production/miscToolsAndNotes/xslUtilityScripts/upVersionParents.sh b/production/miscToolsAndNotes/xslUtilityScripts/upVersionParents.sh
index 5d9cc10a..baa22f4c 100755
--- a/production/miscToolsAndNotes/xslUtilityScripts/upVersionParents.sh
+++ b/production/miscToolsAndNotes/xslUtilityScripts/upVersionParents.sh
@@ -14,7 +14,9 @@ export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
TMP_DIR=${TMP_DIR:-$(pwd)/../tmp}
mkdir -p $TMP_DIR
-export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"}
+MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
+mkdir -p ${MAVEN_TMP_DIR}
+export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${MAVEN_TMP_DIR}"}
export MAVEN_PATH=${MAVEN_PATH:-/opt/local/apache-maven-3.1.1/bin}
export PATH=${JAVA_HOME}/bin:${MAVEN_PATH}:${PATH}

Back to the top