Skip to content

Commit 7239ccb

Browse files
authored
HBASE-22653 Do not run errorProne on JDK7 (#651)
Signed-off-by: Sean Busbey <busbey@apache.org>
1 parent 0339ad1 commit 7239ccb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

dev-support/Jenkinsfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
138138
MULTIJDK = '/usr/lib/jvm/zulu-8-amd64,/usr/lib/jvm/zulu-7-amd64'
139139
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
140140
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_GENERAL}"
141+
SKIP_ERRORPRONE = 'true'
141142
}
142143
steps {
143144
// 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}"
205206
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_JDK7}"
206207
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_JDK7}"
207208
// On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
209+
SKIP_ERRORPRONE = 'true'
208210
}
209211
steps {
210212
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile

dev-support/hbase_nightly_yetus.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ YETUS_ARGS=("--ignore-unknown-options=true" "${YETUS_ARGS[@]}")
7373
YETUS_ARGS=("--proclimit=10000" "${YETUS_ARGS[@]}")
7474
YETUS_ARGS=("--dockermemlimit=20g" "${YETUS_ARGS[@]}")
7575

76+
if [[ "$SKIP_ERRORPRONE" = true ]]; then
77+
YETUS_ARGS=("--skip-errorprone" "${YETUS_ARGS[@]}")
78+
fi
79+
7680
if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
7781
YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
7882
fi

0 commit comments

Comments
 (0)