You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ss...@apache.org on 2016/05/23 21:34:21 UTC
hive git commit: HIVE-13520. Don't allow any test to run for longer
than 60minutes in the ptest setup. (Siddharth Seth,
reviewed by Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master e2d07e277 -> 7fb4b1fed
HIVE-13520. Don't allow any test to run for longer than 60minutes in the ptest setup. (Siddharth Seth, reviewed by Ashutosh Chauhan)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7fb4b1fe
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7fb4b1fe
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7fb4b1fe
Branch: refs/heads/master
Commit: 7fb4b1fed225cb00eccb322fb677c8a10f8c02c2
Parents: e2d07e2
Author: Siddharth Seth <ss...@apache.org>
Authored: Mon May 23 14:33:56 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Mon May 23 14:33:56 2016 -0700
----------------------------------------------------------------------
testutils/ptest2/src/main/resources/batch-exec.vm | 4 ++--
.../execution/TestScripts.testAlternativeTestJVM.approved.txt | 4 ++--
.../hive/ptest/execution/TestScripts.testBatch.approved.txt | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7fb4b1fe/testutils/ptest2/src/main/resources/batch-exec.vm
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/batch-exec.vm b/testutils/ptest2/src/main/resources/batch-exec.vm
index c2f66be..99ddf80 100644
--- a/testutils/ptest2/src/main/resources/batch-exec.vm
+++ b/testutils/ptest2/src/main/resources/batch-exec.vm
@@ -62,7 +62,7 @@ then
testModule=./
fi
pushd $testModule
- timeout 2h mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven \
+ timeout 1h mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven \
$mavenArgs $mavenTestArgs $testArguments 1>$logDir/maven-test.txt 2>&1 </dev/null &
#[[
pid=$!
@@ -70,7 +70,7 @@ then
popd
elif [[ "${buildTool}" == "ant" ]]
then
- timeout 2h ant ${antTestTarget} -Dtest.junit.output.format=xml \
+ timeout 1h ant ${antTestTarget} -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=$localDir/$instanceName/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \
http://git-wip-us.apache.org/repos/asf/hive/blob/7fb4b1fe/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
index 0ae4fc2..153e4e5 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
@@ -61,7 +61,7 @@ then
testModule=./
fi
pushd $testModule
- timeout 2h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
+ timeout 1h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
$mavenArgs $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 </dev/null &
pid=$!
@@ -69,7 +69,7 @@ then
popd
elif [[ "ant" == "ant" ]]
then
- timeout 2h ant ${antTestTarget} -Dtest.junit.output.format=xml \
+ timeout 1h ant ${antTestTarget} -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \
http://git-wip-us.apache.org/repos/asf/hive/blob/7fb4b1fe/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
index c6c524c..1dee7e2 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
@@ -61,7 +61,7 @@ then
testModule=./
fi
pushd $testModule
- timeout 2h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
+ timeout 1h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
-Dant=arg1 $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 </dev/null &
pid=$!
@@ -69,7 +69,7 @@ then
popd
elif [[ "maven" == "ant" ]]
then
- timeout 2h ant testonly -Dtest.junit.output.format=xml \
+ timeout 1h ant testonly -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \