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 aa53493 HBASE-24002 shadedjars check does not propagate --hadoop-profile aa53493 is described below commit aa53493ae83852057dcd9c9380d5953a79fc719e Author: Nick Dimiduk <ndimi...@apache.org> AuthorDate: Tue Mar 17 12:32:48 2020 -0700 HBASE-24002 shadedjars check does not propagate --hadoop-profile This implementation is almost surely incorrect. Personality initialization parses the `--hadoop-profile` argument and sets `HADOOP_PROFILE`. That value is then used to build an `extras` value that is passed along to module initialization. I'm guessing that the `extras` value need to be honored down in the shadedjars module. I'm not clear on how to make that work (need to study the interfaces at play here), so taking the more ham-handed approach of referring to `HADOOP_PROFILE`. I'm not sure if this will even work, or if it will only work because the `foo_yetus.sh` scripts happen to use a variable of the same name. Signed-off-by: Jan Hentschel <jan.hentsc...@ultratendency.com> Signed-off-by: stack <st...@apache.org> --- dev-support/hbase-personality.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 50a7080..3fe9fd9 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -464,13 +464,17 @@ function shadedjars_rebuild start_clock + local -a maven_args=('clean' 'verify' '-fae' '--batch-mode' + '-pl' 'hbase-shaded/hbase-shaded-check-invariants' '-am' + '-Dtest=NoUnitTests' '-DHBasePatchProcess' '-Prelease' + '-Dmaven.javadoc.skip=true' '-Dcheckstyle.skip=true' '-Dspotbugs.skip=true') + if [[ -n "${HADOOP_PROFILE}" ]]; then + maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}") + fi + # disabled because "maven_executor" needs to return both command and args # shellcheck disable=2046 - echo_and_redirect "${logfile}" \ - $(maven_executor) clean verify -fae --batch-mode \ - -pl hbase-shaded/hbase-shaded-check-invariants -am \ - -Dtest=NoUnitTests -DHBasePatchProcess -Prelease \ - -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true + echo_and_redirect "${logfile}" $(maven_executor) "${maven_args[@]}" count=$(${GREP} -c '\[ERROR\]' "${logfile}") if [[ ${count} -gt 0 ]]; then