From 2f6700b2d674d2d262386a8b6c0686100287787d Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Wed, 13 Jan 2021 09:56:58 +0800 Subject: [PATCH] HBASE-25476 Enable error prone check in pre commit (#2860) Signed-off-by: Guanghao Zhang --- dev-support/Jenkinsfile_GitHub | 4 +++- dev-support/jenkins_precommit_github_yetus.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub index a81f306c141..caa9c263986 100644 --- a/dev-support/Jenkinsfile_GitHub +++ b/dev-support/Jenkinsfile_GitHub @@ -38,7 +38,7 @@ pipeline { YETUS_DRIVER_REL = "${SRC_REL}/dev-support/jenkins_precommit_github_yetus.sh" // Branch or tag name. Yetus release tags are 'rel/X.Y.Z' YETUS_VERSION = 'rel/0.12.0' - GENERAL_CHECK_PLUGINS = 'all,-compile,-javac,-javadoc,-jira,-shadedjars,-unit' + GENERAL_CHECK_PLUGINS = 'all,-javadoc,-jira,-shadedjars,-unit' JDK_SPECIFIC_PLUGINS = 'compile,github,htmlout,javac,javadoc,maven,mvninstall,shadedjars,unit' // output from surefire; sadly the archive function in yetus only works on file names. ARCHIVE_PATTERN_LIST = 'TEST-*.xml,org.apache.h*.txt,*.dumpstream,*.dump' @@ -168,6 +168,7 @@ pipeline { BUILD_URL_ARTIFACTS = "artifact/${WORKDIR_REL}/${PATCH_REL}" DOCKERFILE = "${WORKDIR}/${DOCKERFILE_REL}" YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}" + SKIP_ERRORPRONE = true } steps { dir("${SOURCEDIR}") { @@ -269,6 +270,7 @@ pipeline { BUILD_URL_ARTIFACTS = "artifact/${WORKDIR_REL}/${PATCH_REL}" DOCKERFILE = "${WORKDIR}/${DOCKERFILE_REL}" YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}" + SKIP_ERRORPRONE = true } steps { dir("${SOURCEDIR}") { diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh index 8f8edaa661e..4c81a5ac3c8 100755 --- a/dev-support/jenkins_precommit_github_yetus.sh +++ b/dev-support/jenkins_precommit_github_yetus.sh @@ -122,7 +122,10 @@ YETUS_ARGS+=("--whitespace-tabs-ignore-list=.*/generated/.*") YETUS_ARGS+=("--tests-filter=${TESTS_FILTER}") YETUS_ARGS+=("--personality=${SOURCEDIR}/dev-support/hbase-personality.sh") YETUS_ARGS+=("--quick-hadoopcheck") -YETUS_ARGS+=("--skip-errorprone") +if [[ "${SKIP_ERRORPRONE}" = "true" ]]; then + # skip error prone + YETUS_ARGS+=("--skip-errorprone") +fi # effectively treat dev-support as a custom maven module YETUS_ARGS+=("--skip-dirs=dev-support") # For testing with specific hadoop version. Activates corresponding profile in maven runs.