HBASE-22653 Do not run errorProne on JDK7 (#651)
Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
parent
0339ad1156
commit
7239ccb433
|
@ -138,6 +138,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
|
||||||
MULTIJDK = '/usr/lib/jvm/zulu-8-amd64,/usr/lib/jvm/zulu-7-amd64'
|
MULTIJDK = '/usr/lib/jvm/zulu-8-amd64,/usr/lib/jvm/zulu-7-amd64'
|
||||||
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
|
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
|
||||||
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_GENERAL}"
|
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_GENERAL}"
|
||||||
|
SKIP_ERRORPRONE = 'true'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
|
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
|
||||||
|
@ -205,6 +206,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
|
||||||
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_JDK7}"
|
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_JDK7}"
|
||||||
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_JDK7}"
|
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_JDK7}"
|
||||||
// On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
|
// On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
|
||||||
|
SKIP_ERRORPRONE = 'true'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
|
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
|
||||||
|
|
|
@ -73,6 +73,10 @@ YETUS_ARGS=("--ignore-unknown-options=true" "${YETUS_ARGS[@]}")
|
||||||
YETUS_ARGS=("--proclimit=10000" "${YETUS_ARGS[@]}")
|
YETUS_ARGS=("--proclimit=10000" "${YETUS_ARGS[@]}")
|
||||||
YETUS_ARGS=("--dockermemlimit=20g" "${YETUS_ARGS[@]}")
|
YETUS_ARGS=("--dockermemlimit=20g" "${YETUS_ARGS[@]}")
|
||||||
|
|
||||||
|
if [[ "$SKIP_ERRORPRONE" = true ]]; then
|
||||||
|
YETUS_ARGS=("--skip-errorprone" "${YETUS_ARGS[@]}")
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
|
if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
|
||||||
YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
|
YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue