HBASE-25362 Fix quoting in hbase-vote to avoid voting build failures (#2737)

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
Signed-off-by: Stephen Wu <taklwu@apache.org>
This commit is contained in:
z-york 2020-12-08 23:34:18 -08:00 committed by GitHub
parent 56dd3eba81
commit fbe338de1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions

View File

@ -40,10 +40,13 @@ Usage: ${SCRIPT} -s | --source <url> [-k | --key <signature>] [-f | --keys-file-
https://downloads.apache.org/hbase/KEYS https://downloads.apache.org/hbase/KEYS
-o | --output-dir '</path>' directory which has the stdout and stderr of each verification target -o | --output-dir '</path>' directory which has the stdout and stderr of each verification target
-P | list of maven profiles to activate for test UT/IT, i.e. <-P runSmallTests> Defaults to runAllTests -P | list of maven profiles to activate for test UT/IT, i.e. <-P runSmallTests> Defaults to runAllTests
-D | list of maven properties to set for the mvn invocations, i.e. <-D hadoop.profile=3.0> Defaults to unset -D | list of maven properties to set for the mvn invocations, i.e. <-D hadoop.profile=3.0 -D skipTests> Defaults to unset
__EOF __EOF
} }
MVN_PROFILES=()
MVN_PROPERTIES=()
while ((${#})); do while ((${#})); do
case "${1}" in case "${1}" in
-h | --help ) -h | --help )
@ -57,9 +60,9 @@ while ((${#})); do
-o | --output-dir ) -o | --output-dir )
OUTPUT_DIR="${2}"; shift 2 ;; OUTPUT_DIR="${2}"; shift 2 ;;
-P ) -P )
MVN_PROFILES="-P ${2}"; shift 2 ;; MVN_PROFILES+=("-P ${2}"); shift 2 ;;
-D ) -D )
MVN_PROPERTIES="-D ${2}"; shift 2 ;; MVN_PROPERTIES+=("-D ${2}"); shift 2 ;;
* ) * )
usage >&2; exit 1 ;; usage >&2; exit 1 ;;
esac esac
@ -92,8 +95,8 @@ if [ ! -d "${OUTPUT_DIR}" ]; then
fi fi
# Maven profile must be provided # Maven profile must be provided
if [ -z "${MVN_PROFILES}" ]; then if [ ${#MVN_PROFILES[@]} -eq 0 ]; then
MVN_PROFILES="-P runAllTests" MVN_PROFILES=("-P runAllTests")
fi fi
OUTPUT_PATH_PREFIX="${OUTPUT_DIR}"/"${HBASE_RC_VERSION}" OUTPUT_PATH_PREFIX="${OUTPUT_DIR}"/"${HBASE_RC_VERSION}"
@ -145,17 +148,18 @@ function unzip_from_source() {
function rat_test() { function rat_test() {
rm -f "${OUTPUT_PATH_PREFIX}"_rat_test rm -f "${OUTPUT_PATH_PREFIX}"_rat_test
mvn clean apache-rat:check "${MVN_PROPERTIES}" 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_rat_test && RAT_CHECK_PASSED=1 mvn clean apache-rat:check "${MVN_PROPERTIES[@]}" 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_rat_test && RAT_CHECK_PASSED=1
} }
function build_from_source() { function build_from_source() {
rm -f "${OUTPUT_PATH_PREFIX}"_build_from_source rm -f "${OUTPUT_PATH_PREFIX}"_build_from_source
mvn clean install "${MVN_PROPERTIES}" -DskipTests 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_build_from_source && BUILD_FROM_SOURCE_PASSED=1 # Hardcode skipTests for faster build. Testing is covered later.
mvn clean install "${MVN_PROPERTIES[@]}" -DskipTests 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_build_from_source && BUILD_FROM_SOURCE_PASSED=1
} }
function run_tests() { function run_tests() {
rm -f "${OUTPUT_PATH_PREFIX}"_run_tests rm -f "${OUTPUT_PATH_PREFIX}"_run_tests
mvn package "${MVN_PROFILES}" "${MVN_PROPERTIES}" -Dsurefire.rerunFailingTestsCount=3 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_run_tests && UNIT_TEST_PASSED=1 mvn package "${MVN_PROFILES[@]}" "${MVN_PROPERTIES[@]}" -Dsurefire.rerunFailingTestsCount=3 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_run_tests && UNIT_TEST_PASSED=1
} }
function execute() { function execute() {
@ -167,11 +171,11 @@ function print_when_exit() {
* Signature: $( ((SIGNATURE_PASSED)) && echo "ok" || echo "failed" ) * Signature: $( ((SIGNATURE_PASSED)) && echo "ok" || echo "failed" )
* Checksum : $( ((CHECKSUM_PASSED)) && echo "ok" || echo "failed" ) * Checksum : $( ((CHECKSUM_PASSED)) && echo "ok" || echo "failed" )
* Rat check (${JAVA_VERSION}): $( ((RAT_CHECK_PASSED)) && echo "ok" || echo "failed" ) * Rat check (${JAVA_VERSION}): $( ((RAT_CHECK_PASSED)) && echo "ok" || echo "failed" )
- mvn clean apache-rat:check "${MVN_PROPERTIES}" - mvn clean apache-rat:check ${MVN_PROPERTIES[@]}
* Built from source (${JAVA_VERSION}): $( ((BUILD_FROM_SOURCE_PASSED)) && echo "ok" || echo "failed" ) * Built from source (${JAVA_VERSION}): $( ((BUILD_FROM_SOURCE_PASSED)) && echo "ok" || echo "failed" )
- mvn clean install -DskipTests "${MVN_PROPERTIES}" - mvn clean install ${MVN_PROPERTIES[@]} -DskipTests
* Unit tests pass (${JAVA_VERSION}): $( ((UNIT_TEST_PASSED)) && echo "ok" || echo "failed" ) * Unit tests pass (${JAVA_VERSION}): $( ((UNIT_TEST_PASSED)) && echo "ok" || echo "failed" )
- mvn package ${MVN_PROFILES} "${MVN_PROPERTIES}" -Dsurefire.rerunFailingTestsCount=3 - mvn package ${MVN_PROFILES[@]} ${MVN_PROPERTIES[@]} -Dsurefire.rerunFailingTestsCount=3
__EOF __EOF
if ((CHECKSUM_PASSED)) && ((SIGNATURE_PASSED)) && ((RAT_CHECK_PASSED)) && ((BUILD_FROM_SOURCE_PASSED)) && ((UNIT_TEST_PASSED)) ; then if ((CHECKSUM_PASSED)) && ((SIGNATURE_PASSED)) && ((RAT_CHECK_PASSED)) && ((BUILD_FROM_SOURCE_PASSED)) && ((UNIT_TEST_PASSED)) ; then
exit 0 exit 0