[hbase] branch master updated: HBASE-24045 Support setting `-Dhadoop.profile` in adhoc_run_tests.sh

[nd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 5e63509  HBASE-24045 Support setting `-Dhadoop.profile` in adhoc_run_tests.sh
5e63509 is described below

commit 5e6350978173e7ca72d804d3e41e0f18d9a1b922
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Wed Mar 25 11:56:10 2020 -0700

    HBASE-24045 Support setting `-Dhadoop.profile` in adhoc_run_tests.sh
    
    Signed-off-by: stack <st...@apache.org>
---
 dev-support/adhoc_run_tests/adhoc_run_tests.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-support/adhoc_run_tests/adhoc_run_tests.sh b/dev-support/adhoc_run_tests/adhoc_run_tests.sh
index 1dedcb1..79a2c8f 100755
--- a/dev-support/adhoc_run_tests/adhoc_run_tests.sh
+++ b/dev-support/adhoc_run_tests/adhoc_run_tests.sh
@@ -21,11 +21,12 @@ function usage {
   echo "Usage: ${0} [options] TestSomeTestName [TestOtherTest...]"
   echo ""
   echo "    --repeat times                        number of times to repeat if successful"
-  echo "    --force-timeout seconds               Seconds to wait before killing a given test run."
+  echo "    --force-timeout seconds               Seconds to wait before killing a given test run"
   echo "    --maven-local-repo /path/to/use       Path for maven artifacts while building"
   echo "    --surefire-fork-count                 set the fork-count. only useful if multiple " \
       "tests running (default 0.5C)"
   echo "    --log-output /path/to/use             path to directory to hold attempt log"
+  echo "    --hadoop-profile profile              specify a value passed via -Dhadoop.profile"
   exit 1
 }
 # Get arguments
@@ -34,6 +35,7 @@ declare fork_count="0.5C"
 declare -i attempts=1
 declare maven_repo="${HOME}/.m2/repository"
 declare output="."
+declare hadoop_profile='2.0'
 while [ $# -gt 0 ]
 do
   case "$1" in
@@ -42,6 +44,7 @@ do
     --repeat) shift; attempts=$1; shift;;
     --log-output) shift; output=$1; shift;;
     --surefire-fork-count) shift; fork_count=$1; shift;;
+    --hadoop-profile) shift; hadoop_profile=$1; shift;;
     --) shift; break;;
     -*) usage ;;
     *)  break;;  # terminate while loop
@@ -94,9 +97,12 @@ done
 declare tests="${*}"
 for attempt in $(seq "${attempts}"); do
   echo "Attempt ${attempt}" >&2
-  echo_run_redirect "${output}/mvn_test.log" mvn --batch-mode -Dmaven.repo.local="${maven_repo}" \
+  echo_run_redirect "${output}/mvn_test.log" mvn --batch-mode \
+      -Dhadoop.profile="${hadoop_profile}" \
+      -Dmaven.repo.local="${maven_repo}" \
       -Dtest="${tests// /,}" \
       -Dsurefire.rerunFailingTestsCount=0 -Dsurefire.parallel.forcedTimeout="${force_timeout}" \
       -Dsurefire.shutdown=kill -DtrimStackTrace=false -am "${mvn_module_arg[@]}" \
-      -DforkCount="${fork_count}" package
+      -DforkCount="${fork_count}" \
+      test
 done