HADOOP-11001. Fix test-patch to work with the git repo. (kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4c9a784 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4c9a784 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4c9a784 Branch: refs/heads/HDFS-6584 Commit: c4c9a784114dba503fa49fd5b6f146479a1f3f18 Parents: 7a16731 Author: Karthik Kambatla <ka...@apache.org> Authored: Wed Aug 27 23:12:57 2014 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Wed Aug 27 23:12:57 2014 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 26 +++++++++++--------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 2 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4c9a784/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index ed671a6..cbeb819 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -16,7 +16,7 @@ ulimit -n 1024 ### Setup some variables. -### SVN_REVISION and BUILD_URL are set by Hudson if it is run by patch process +### BUILD_URL is set by Hudson if it is run by patch process ### Read variables from properties file bindir=$(dirname $0) @@ -36,7 +36,7 @@ BUILD_NATIVE=true PS=${PS:-ps} AWK=${AWK:-awk} WGET=${WGET:-wget} -SVN=${SVN:-svn} +GIT=${GIT:-git} GREP=${GREP:-grep} PATCH=${PATCH:-patch} DIFF=${DIFF:-diff} @@ -59,13 +59,13 @@ printUsage() { echo "--mvn-cmd=<cmd> The 'mvn' command to use (default \$MAVEN_HOME/bin/mvn, or 'mvn')" echo "--ps-cmd=<cmd> The 'ps' command to use (default 'ps')" echo "--awk-cmd=<cmd> The 'awk' command to use (default 'awk')" - echo "--svn-cmd=<cmd> The 'svn' command to use (default 'svn')" + echo "--git-cmd=<cmd> The 'git' command to use (default 'git')" echo "--grep-cmd=<cmd> The 'grep' command to use (default 'grep')" echo "--patch-cmd=<cmd> The 'patch' command to use (default 'patch')" echo "--diff-cmd=<cmd> The 'diff' command to use (default 'diff')" echo "--findbugs-home=<path> Findbugs home directory (default FINDBUGS_HOME environment variable)" echo "--forrest-home=<path> Forrest home directory (default FORREST_HOME environment variable)" - echo "--dirty-workspace Allow the local SVN workspace to have uncommitted changes" + echo "--dirty-workspace Allow the local git workspace to have uncommitted changes" echo "--run-tests Run all tests below the base directory" echo "--build-native=<bool> If true, then build native components (default 'true')" echo @@ -107,8 +107,8 @@ parseArgs() { --wget-cmd=*) WGET=${i#*=} ;; - --svn-cmd=*) - SVN=${i#*=} + --git-cmd=*) + GIT=${i#*=} ;; --grep-cmd=*) GREP=${i#*=} @@ -197,7 +197,7 @@ checkout () { echo "" ### When run by a developer, if the workspace contains modifications, do not continue ### unless the --dirty-workspace option was set - status=`$SVN stat --ignore-externals | sed -e '/^X[ ]*/D'` + status=`$GIT status --porcelain` if [[ $JENKINS == "false" ]] ; then if [[ "$status" != "" && -z $DIRTY_WORKSPACE ]] ; then echo "ERROR: can't run in a workspace that contains the following modifications" @@ -207,10 +207,12 @@ checkout () { echo else cd $BASEDIR - $SVN revert -R . - rm -rf `$SVN status --no-ignore` - $SVN update + $GIT reset --hard + $GIT clean -xdf + $GIT checkout trunk + $GIT pull --rebase fi + GIT_REVISION=`git rev-parse --verify --short HEAD` return $? } @@ -229,10 +231,10 @@ downloadPatch () { echo "$defect patch is being downloaded at `date` from" echo "$patchURL" $WGET -q -O $PATCH_DIR/patch $patchURL - VERSION=${SVN_REVISION}_${defect}_PATCH-${patchNum} + VERSION=${GIT_REVISION}_${defect}_PATCH-${patchNum} JIRA_COMMENT="Here are the results of testing the latest attachment $patchURL - against trunk revision ${SVN_REVISION}." + against trunk revision ${GIT_REVISION}." ### Copy in any supporting files needed by this process cp -r $SUPPORT_DIR/lib/* ./lib http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4c9a784/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index b13cd79..ecbaaab 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -713,6 +713,8 @@ Release 2.5.1 - UNRELEASED BUG FIXES + HADOOP-11001. Fix test-patch to work with the git repo. (kasha) + Release 2.5.0 - 2014-08-11 INCOMPATIBLE CHANGES
