Revert "HIVE-14835: Improve ptest2 build time (Prasanth Jayachandran reviewed by Sergio Pena)"
This reverts commit d3b88f664415ff114de74aa2a0da2f1e1acbf60d. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/871b55fa Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/871b55fa Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/871b55fa Branch: refs/heads/repl2 Commit: 871b55fa17e3d63a91a34f48df0bc2156f3473ce Parents: ac977cc Author: Prasanth Jayachandran <prasan...@apache.org> Authored: Tue Sep 27 21:42:09 2016 -0700 Committer: Prasanth Jayachandran <prasan...@apache.org> Committed: Tue Sep 27 21:42:09 2016 -0700 ---------------------------------------------------------------------- dev-support/jenkins-execute-build.sh | 4 +++- testutils/ptest2/src/main/resources/source-prep.vm | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/871b55fa/dev-support/jenkins-execute-build.sh ---------------------------------------------------------------------- diff --git a/dev-support/jenkins-execute-build.sh b/dev-support/jenkins-execute-build.sh index 972abae..2142942 100644 --- a/dev-support/jenkins-execute-build.sh +++ b/dev-support/jenkins-execute-build.sh @@ -70,7 +70,9 @@ test -n "$TEST_HANDLE" || fail "TEST_HANDLE must be specified and cannot be empt test -n "$PTEST_API_ENDPOINT" || fail "PTEST_API_ENDPOINT must be specified and cannot be empty." test -n "$PTEST_LOG_ENDPOINT" || fail "PTEST_LOG_ENDPOINT must be specified and cannot be empty." -MVN_REPO_LOCAL=${HOME}/.m2/repository +# WORKSPACE is an environment variable created by Jenkins, and it is the directory where the build is executed. +# If not set, then default to $HOME +MVN_REPO_LOCAL=${WORKSPACE:-$HOME}/.m2/repository # Directory where to build the ptest framework PTEST_BUILD_DIR="$PWD/hive/build" http://git-wip-us.apache.org/repos/asf/hive/blob/871b55fa/testutils/ptest2/src/main/resources/source-prep.vm ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/resources/source-prep.vm b/testutils/ptest2/src/main/resources/source-prep.vm index 0fc22be..67e6a95 100644 --- a/testutils/ptest2/src/main/resources/source-prep.vm +++ b/testutils/ptest2/src/main/resources/source-prep.vm @@ -102,11 +102,11 @@ cd $workingDir/ fi done #end - mvn -B clean install -DskipTests -T 4 -q -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs + mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs if [[ -d "itests" ]] then cd itests - mvn -B clean install -DskipTests -T 4 -q -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs + mvn -B clean install -DskipTests -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs fi elif [[ "${buildTool}" == "ant" ]] then
