HBASE-12944 Support patches to branches in precommit jenkins build (ADDENDUM moves sourcing of .properties file to start of the script)

This commit is contained in:
Enis Soztutar 2015-01-29 15:30:05 -08:00
parent 3931910460
commit a5613efa7b
1 changed files with 2 additions and 1 deletions

View File

@ -34,6 +34,8 @@ PATCH_DIR=/tmp
BASEDIR=$(pwd) BASEDIR=$(pwd)
BRANCH_NAME="master" BRANCH_NAME="master"
. $BASEDIR/dev-support/test-patch.properties
PS=${PS:-ps} PS=${PS:-ps}
AWK=${AWK:-awk} AWK=${AWK:-awk}
WGET=${WGET:-wget} WGET=${WGET:-wget}
@ -277,7 +279,6 @@ setup () {
cleanupAndExit 0 cleanupAndExit 0
fi fi
fi fi
. $BASEDIR/dev-support/test-patch.properties
### exit if warnings are NOT defined in the properties file ### exit if warnings are NOT defined in the properties file
if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]] ; then if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]] ; then
echo "Please define the following properties in test-patch.properties file" echo "Please define the following properties in test-patch.properties file"