HBASE-20075 remove logic for branch-1.1 nightly testing

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Sean Busbey 2018-02-24 15:50:12 -06:00
parent 383b7cc592
commit c415ddb38c
1 changed files with 0 additions and 9 deletions

View File

@ -195,10 +195,6 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine" "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
''' '''
sh '''#!/usr/bin/env bash sh '''#!/usr/bin/env bash
# for branch-1.1 we don't do jdk8 findbugs, so do it here
if [ "${BRANCH_NAME}" == "branch-1.1" ]; then
TESTS+=",findbugs"
fi
rm -rf "${OUTPUT_DIR}/commentfile}" rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0 declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@ -249,11 +245,6 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
label 'Hadoop' label 'Hadoop'
} }
} }
when {
not {
branch 'branch-1.1*'
}
}
environment { environment {
TESTS = 'mvninstall,compile,javac,unit,findbugs,htmlout' TESTS = 'mvninstall,compile,javac,unit,findbugs,htmlout'
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_HADOOP2}" OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_HADOOP2}"