From 3b6407e29cd8bdf0b15d803287fd2cc7843ec298 Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Fri, 13 Sep 2019 10:24:40 +0200 Subject: [PATCH] HBASE-23019 Handle --skip-errorprone on branch-1 --- dev-support/docker/Dockerfile | 12 +----------- dev-support/hbase-personality.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index b82b23bc0f..428c1053c2 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -61,6 +61,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ python2.7 \ python-pip \ rsync \ + shellcheck \ snappy \ zlib1g-dev \ wget @@ -115,17 +116,6 @@ RUN mkdir -p /opt/findbugs && \ tar xzf /opt/findbugs.tar.gz --strip-components 1 -C /opt/findbugs ENV FINDBUGS_HOME /opt/findbugs -#### -# Install shellcheck -#### -RUN apt-get -q install -y cabal-install -RUN mkdir /root/.cabal -RUN echo "remote-repo: hackage.fpcomplete.com:http://hackage.fpcomplete.com/" >> /root/.cabal/config -#RUN echo "remote-repo: hackage.haskell.org:http://hackage.haskell.org/" > /root/.cabal/config -RUN echo "remote-repo-cache: /root/.cabal/packages" >> /root/.cabal/config -RUN cabal update -RUN cabal install shellcheck --global - #### # Install pylint #### diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 2d87face05..c2be77297f 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -97,6 +97,10 @@ function personality_parse_args delete_parameter "${i}" HADOOP_PROFILE=${i#*=} ;; + --skip-errorprone) + delete_parameter "${i}" + SKIP_ERRORPRONE=true + ;; esac done } @@ -168,9 +172,9 @@ function personality_modules return fi -# if [[ ${testtype} == compile ]]; then -# extra="${extra} -PerrorProne" -# fi + if [[ ${testtype} == compile ]] && [[ "${SKIP_ERRORPRONE}" != "true" ]]; then + extra="${extra} -PerrorProne" + fi # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the -- 2.23.0