You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/09/22 18:35:58 UTC
[hbase] branch branch-1 updated: HBASE-22653 Do not run errorProne
on JDK7 (#651)
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 7239ccb HBASE-22653 Do not run errorProne on JDK7 (#651)
7239ccb is described below
commit 7239ccb433b80975f93bea6b8841de9a86847f24
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Sun Sep 22 20:35:50 2019 +0200
HBASE-22653 Do not run errorProne on JDK7 (#651)
Signed-off-by: Sean Busbey <bu...@apache.org>
---
dev-support/Jenkinsfile | 2 ++
dev-support/hbase_nightly_yetus.sh | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 0b3f3ac..83cd8fe 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -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'
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_GENERAL}"
+ SKIP_ERRORPRONE = 'true'
}
steps {
// 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 = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_JDK7}"
// On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
+ SKIP_ERRORPRONE = 'true'
}
steps {
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index 9159057..2ec03c5 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -73,6 +73,10 @@ YETUS_ARGS=("--ignore-unknown-options=true" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--proclimit=10000" "${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
YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
fi