Repository: yetus Updated Branches: refs/heads/master 2847c5896 -> 90e57f2cb
YETUS-89. Variable name "HOW_TO_CONTRIBUTE" is misleading 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/90e57f2c Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/90e57f2c Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/90e57f2c Branch: refs/heads/master Commit: 90e57f2cba73173590fe8d358c6439ec77b5337d Parents: 2847c58 Author: Kengo Seki <[email protected]> Authored: Sun Nov 22 00:12:23 2015 +0900 Committer: Allen Wittenauer <[email protected]> Committed: Sat Nov 21 10:58:45 2015 -0800 ---------------------------------------------------------------------- .../documentation/in-progress/precommit-advanced.md | 4 ++-- precommit/personality/bigtop.sh | 4 +--- precommit/personality/drill.sh | 2 +- precommit/personality/flink.sh | 2 -- precommit/personality/geode.sh | 2 +- precommit/personality/hadoop.sh | 2 +- precommit/personality/hbase.sh | 2 -- precommit/personality/kafka.sh | 2 +- precommit/personality/pig.sh | 2 -- precommit/personality/samza.sh | 4 ++-- precommit/personality/tajo.sh | 4 ++-- precommit/personality/tez.sh | 4 ++-- precommit/test-patch.d/jira.sh | 4 ++-- precommit/test-patch.sh | 10 +++++----- 14 files changed, 20 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/asf-site-src/source/documentation/in-progress/precommit-advanced.md ---------------------------------------------------------------------- diff --git a/asf-site-src/source/documentation/in-progress/precommit-advanced.md b/asf-site-src/source/documentation/in-progress/precommit-advanced.md index e404988..878821d 100644 --- a/asf-site-src/source/documentation/in-progress/precommit-advanced.md +++ b/asf-site-src/source/documentation/in-progress/precommit-advanced.md @@ -242,8 +242,6 @@ There are a handful of extremely important system variables that make life easie * GITHUB\_REPO is to help test-patch when talking to Github. If test-patch is given just a number on the command line, it will default to using this repo to determine the pull request. -* HOW\_TO\_CONTRIBUTE should be a URL that points to a project's on-boarding documentation for new users. Currently, it is used to suggest a review of patch naming guidelines. Since this should be project specific information, it is useful to set in a project's personality. - * JIRA\_ISSUE\_RE is to help test-patch when talking to JIRA. It helps determine if the given project is appropriate for the given JIRA issue. * MODULE and other MODULE\_\* are arrays that contain which modules, the status, etc, to be operated upon. These should be treated as read-only by plug-ins. @@ -252,4 +250,6 @@ There are a handful of extremely important system variables that make life easie * PATCH\_DIR is the name of the temporary directory that houses test-patch artifacts (such as logs and the patch file itself) +* PATCH\_NAMING\_RULE should be a URL that points to a project's on-boarding documentation for new users. It is used to suggest a review of patch naming guidelines. Since this should be project specific information, it is useful to set in a project's personality. + * TEST\_PARALLEL if parallel unit tests have been requested. Project personalities are responsible for actually enabling or ignoring the request. TEST\_THREADS is the number of threads that have been requested to run in parallel. http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/bigtop.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/bigtop.sh b/precommit/personality/bigtop.sh index 3854f6b..9f234de 100755 --- a/precommit/personality/bigtop.sh +++ b/precommit/personality/bigtop.sh @@ -23,8 +23,6 @@ function personality_globals # shellcheck disable=SC2034 JIRA_ISSUE_RE='^BIGTOP-[0-9]+$' # shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="" - # shellcheck disable=SC2034 BUILDTOOL=gradle # shellcheck disable=SC2034 GITHUB_REPO="apache/bigtop" @@ -69,4 +67,4 @@ function bigtop_postapply_postinstall echo_and_redirect "${PATCH_DIR}/bigtop-patch-toolchain.txt" "${GRADLEW}" toolchain popd >/dev/null fi -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/drill.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/drill.sh b/precommit/personality/drill.sh index 9345752..48fcb2e 100755 --- a/precommit/personality/drill.sh +++ b/precommit/personality/drill.sh @@ -21,7 +21,7 @@ function personality_globals #shellcheck disable=SC2034 GITHUB_REPO="apache/drill" #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://drill.apache.org/docs/apache-drill-contribution-guidelines/"; + PATCH_NAMING_RULE="https://drill.apache.org/docs/apache-drill-contribution-guidelines/"; #shellcheck disable=SC2034 JIRA_ISSUE_RE='^DRILL-[0-9]+$' #shellcheck disable=SC2034 http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/flink.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/flink.sh b/precommit/personality/flink.sh index 356c76b..071096e 100755 --- a/precommit/personality/flink.sh +++ b/precommit/personality/flink.sh @@ -24,8 +24,6 @@ function personality_globals JIRA_ISSUE_RE='^FLINK-[0-9]+$' #shellcheck disable=SC2034 GITHUB_REPO="apache/flink" - #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="" } add_test_type flinklib http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/geode.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/geode.sh b/precommit/personality/geode.sh index e6eb53a..f345fe8 100755 --- a/precommit/personality/geode.sh +++ b/precommit/personality/geode.sh @@ -21,7 +21,7 @@ function personality_globals #shellcheck disable=SC2034 PATCH_BRANCH_DEFAULT=develop #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://cwiki.apache.org/confluence/display/GEODE/How+to+Contribute"; + PATCH_NAMING_RULE="https://cwiki.apache.org/confluence/display/GEODE/How+to+Contribute"; #shellcheck disable=SC2034 JIRA_ISSUE_RE='^(GEODE)-[0-9]+$' #shellcheck disable=SC2034 http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/hadoop.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/hadoop.sh b/precommit/personality/hadoop.sh index 6ff2a22..ef16b83 100755 --- a/precommit/personality/hadoop.sh +++ b/precommit/personality/hadoop.sh @@ -23,7 +23,7 @@ function personality_globals #shellcheck disable=SC2034 PATCH_BRANCH_DEFAULT=trunk #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://wiki.apache.org/hadoop/HowToContribute"; + PATCH_NAMING_RULE="https://wiki.apache.org/hadoop/HowToContribute"; #shellcheck disable=SC2034 JIRA_ISSUE_RE='^(HADOOP|YARN|MAPREDUCE|HDFS)-[0-9]+$' #shellcheck disable=SC2034 http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/hbase.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/hbase.sh b/precommit/personality/hbase.sh index 8451f17..c38634a 100755 --- a/precommit/personality/hbase.sh +++ b/precommit/personality/hbase.sh @@ -24,8 +24,6 @@ function personality_globals JIRA_ISSUE_RE='^HBASE-[0-9]+$' #shellcheck disable=SC2034 GITHUB_REPO="apache/hbase" - #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="" # All supported Hadoop versions that we want to test the compilation with HBASE_HADOOP_VERSIONS="2.4.1 2.5.2 2.6.0" http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/kafka.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/kafka.sh b/precommit/personality/kafka.sh index cc4bf09..3c2f2c4 100755 --- a/precommit/personality/kafka.sh +++ b/precommit/personality/kafka.sh @@ -23,7 +23,7 @@ function personality_globals #shellcheck disable=SC2034 JIRA_ISSUE_RE='^KAFKA-[0-9]+$' #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="http://kafka.apache.org/contributing.html"; + PATCH_NAMING_RULE="http://kafka.apache.org/contributing.html"; # shellcheck disable=SC2034 BUILDTOOL=gradle #shellcheck disable=SC2034 http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/pig.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/pig.sh b/precommit/personality/pig.sh index 50ea52f..639df01 100755 --- a/precommit/personality/pig.sh +++ b/precommit/personality/pig.sh @@ -25,8 +25,6 @@ function personality_globals #shellcheck disable=SC2034 GITHUB_REPO="apache/pig" #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="" - #shellcheck disable=SC2034 BUILDTOOL=ant } http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/samza.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/samza.sh b/precommit/personality/samza.sh index 131e73e..e649106 100755 --- a/precommit/personality/samza.sh +++ b/precommit/personality/samza.sh @@ -24,9 +24,9 @@ function personality_globals #shellcheck disable=SC2034 JIRA_ISSUE_RE='^SAMZA-[0-9]+$' #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://cwiki.apache.org/confluence/display/SAMZA/Contributor's+Corner" + PATCH_NAMING_RULE="https://cwiki.apache.org/confluence/display/SAMZA/Contributor's+Corner" # shellcheck disable=SC2034 BUILDTOOL=gradle #shellcheck disable=SC2034 GITHUB_REPO="apache/samza" -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/tajo.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/tajo.sh b/precommit/personality/tajo.sh index aa5fc48..ffe580a 100755 --- a/precommit/personality/tajo.sh +++ b/precommit/personality/tajo.sh @@ -25,5 +25,5 @@ function personality_globals #shellcheck disable=SC2034 GITHUB_REPO="apache/tajo" #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://cwiki.apache.org/confluence/display/TAJO/How+to+Contribute+to+Tajo"; -} \ No newline at end of file + PATCH_NAMING_RULE="https://cwiki.apache.org/confluence/display/TAJO/How+to+Contribute+to+Tajo"; +} http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/personality/tez.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/tez.sh b/precommit/personality/tez.sh index 584865e..91ea0e5 100755 --- a/precommit/personality/tez.sh +++ b/precommit/personality/tez.sh @@ -25,5 +25,5 @@ function personality_globals #shellcheck disable=SC2034 GITHUB_REPO="apache/tez" #shellcheck disable=SC2034 - HOW_TO_CONTRIBUTE="https://cwiki.apache.org/confluence/display/TEZ/How+to+Contribute+to+Tez"; -} \ No newline at end of file + PATCH_NAMING_RULE="https://cwiki.apache.org/confluence/display/TEZ/How+to+Contribute+to+Tez"; +} http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/test-patch.d/jira.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.d/jira.sh b/precommit/test-patch.d/jira.sh index 671cb2b..5f732ad 100755 --- a/precommit/test-patch.d/jira.sh +++ b/precommit/test-patch.d/jira.sh @@ -162,10 +162,10 @@ function jira_locate_patch fi if [[ ! ${PATCHURL} =~ \.patch$ ]]; then - guess_patch_file "${PATCH_DIR}/patch" + guess_patch_file "${fileloc}" if [[ $? == 0 ]]; then yetus_debug "The patch ${PATCHURL} was not named properly, but it looks like a patch file. Proceeding, but issue/branch matching might go awry." - add_vote_table 0 patch "The patch file was not named according to ${PROJECT_NAME}'s naming conventions. Please see ${HOW_TO_CONTRIBUTE} for instructions." + add_vote_table 0 patch "The patch file was not named according to ${PROJECT_NAME}'s naming conventions. Please see ${PATCH_NAMING_RULE} for instructions." else # this definitely isn't a patch so just bail out. return 1 http://git-wip-us.apache.org/repos/asf/yetus/blob/90e57f2c/precommit/test-patch.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh index 7ee8fc8..eae22de 100755 --- a/precommit/test-patch.sh +++ b/precommit/test-patch.sh @@ -56,7 +56,7 @@ function setup_defaults { common_defaults - HOW_TO_CONTRIBUTE="https://yetus.apache.org/documentation/latest/precommit-patchnames"; + PATCH_NAMING_RULE="https://yetus.apache.org/documentation/latest/precommit-patchnames"; INSTANCE=${RANDOM} RELOCATE_PATCH_DIR=false @@ -658,7 +658,7 @@ function yetus_usage # shellcheck disable=SC2153 echo "--build-tool=<tool> Pick which build tool to focus around (${BUILDTOOLS})" echo "--bugcomments=<bug> Only write comments to the screen and this comma delimited list (${BUGSYSTEMS})" - echo "--contrib-guide=<url> URL to point new users towards project conventions. (default: ${HOW_TO_CONTRIBUTE} )" + echo "--contrib-guide=<url> URL to point new users towards project conventions. (default: ${PATCH_NAMING_RULE} )" echo "--debug If set, then output some extra stuff to stderr" echo "--dirty-workspace Allow the local git workspace to have uncommitted changes" echo "--docker Spawn a docker container" @@ -741,7 +741,7 @@ function parse_args BUILD_URL=${i#*=} ;; --contrib-guide=*) - HOW_TO_CONTRIBUTE=${i#*=} + PATCH_NAMING_RULE=${i#*=} ;; --dirty-workspace) DIRTY_WORKSPACE=true @@ -1343,7 +1343,7 @@ function apply_patch_file if [[ $? != 0 ]] ; then echo "PATCH APPLICATION FAILED" ((RESULT = RESULT + 1)) - add_vote_table -1 patch "${PATCH_OR_ISSUE} does not apply to ${PATCH_BRANCH}. Rebase required? Wrong Branch? See ${HOW_TO_CONTRIBUTE} for help." + add_vote_table -1 patch "${PATCH_OR_ISSUE} does not apply to ${PATCH_BRANCH}. Rebase required? Wrong Branch? See ${PATCH_NAMING_RULE} for help." bugsystem_finalreport 1 cleanup_and_exit 1 fi @@ -2536,7 +2536,7 @@ function initialize if [[ $? != 0 ]]; then ((RESULT = RESULT + 1)) yetus_error "ERROR: ${PATCH_OR_ISSUE} does not apply to ${PATCH_BRANCH}." - add_vote_table -1 patch "${PATCH_OR_ISSUE} does not apply to ${PATCH_BRANCH}. Rebase required? Wrong Branch? See ${HOW_TO_CONTRIBUTE} for help." + add_vote_table -1 patch "${PATCH_OR_ISSUE} does not apply to ${PATCH_BRANCH}. Rebase required? Wrong Branch? See ${PATCH_NAMING_RULE} for help." bugsystem_finalreport 1 cleanup_and_exit 1 fi
