YETUS-357. build driver for hadoop shouldn't union unit tests Signed-off-by: Allen Wittenauer <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/9afd94a3 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/9afd94a3 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/9afd94a3 Branch: refs/heads/YETUS-156 Commit: 9afd94a3e4c51da6f88ae8f3ac5ea0e55e8679f8 Parents: 9a543cf Author: Allen Wittenauer <[email protected]> Authored: Tue Apr 12 09:03:20 2016 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Thu Apr 14 00:24:45 2016 -0700 ---------------------------------------------------------------------- precommit/personality/hadoop.sh | 10 ++++++++-- precommit/test-patch.d/maven.sh | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/9afd94a3/precommit/personality/hadoop.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/hadoop.sh b/precommit/personality/hadoop.sh index 580a9c8..f853158 100755 --- a/precommit/personality/hadoop.sh +++ b/precommit/personality/hadoop.sh @@ -39,8 +39,12 @@ function hadoop_order if [[ ${ordering} = normal ]]; then hadoopm="${CHANGED_MODULES[*]}" - elif [[ ${ordering} = union ]]; then + elif [[ ${ordering} = union ]]; then hadoopm="${CHANGED_UNION_MODULES}" + elif [[ ${ordering} = mvnsrc ]]; then + hadoopm="${MAVEN_SRC_MODULES[*]}" + elif [[ ${ordering} = mvnsrctest ]]; then + hadoopm="${MAVEN_SRCTEST_MODULES[*]}" else hadoopm="${ordering}" fi @@ -216,7 +220,9 @@ function personality_modules fi ;; unit) - if [[ "${CHANGED_MODULES[*]}" =~ \. ]]; then + if [[ "${BUILDMODE}" = full ]]; then + ordering=mvnsrc + elif [[ "${CHANGED_MODULES[*]}" =~ \. ]]; then ordering=. fi http://git-wip-us.apache.org/repos/asf/yetus/blob/9afd94a3/precommit/test-patch.d/maven.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh index 32f4b37..77aab32 100755 --- a/precommit/test-patch.d/maven.sh +++ b/precommit/test-patch.d/maven.sh @@ -685,6 +685,16 @@ function maven_reorder_modules yetus_debug "Maven: finish re-ordering modules" yetus_debug "Finished list: ${CHANGED_MODULES[*]}" + # build some utility module lists for maven modules + for index in "${CHANGED_MODULES[@]}"; do + if [[ -d "${index}/src" ]]; then + MAVEN_SRC_MODULES=("${MAVEN_SRC_MODULES[@]}" "${index}") + if [[ -d "${index}/src/test" ]]; then + MAVEN_SRCTEST_MODULES=("${MAVEN_SRCTEST_MODULES[@]}" "${index}") + fi + fi + done + if [[ "${BUILDMODE}" = patch ]]; then add_vote_table 0 mvndep "Maven dependency ordering for ${repostatus}" else
