Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24113 Upgrade the maven we use from 3.5.4 to 3.6.3 in nightlies (#1430) 

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
This commit is contained in:
Michael Stack 2020-04-05 12:53:44 -07:00 committed by stack
parent 26ec491d7d
commit 14a50b106e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-support/docker/Dockerfile
View File

@ -89,12 +89,12 @@ RUN curl --location --fail --silent --show-error --output /tmp/hadolint "${HADOL
echo "${HADOLINT_SHA256} */tmp/hadolint" | sha256sum -c - echo "${HADOLINT_SHA256} */tmp/hadolint" | sha256sum -c -
FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
ENV MAVEN_VERSION='3.5.4' ENV MAVEN_VERSION='3.6.3'
ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
ENV MAVEN_SHA256 'ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d' ENV MAVEN_SHA512 'c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0'
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \ RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \
echo "${MAVEN_SHA256} */tmp/maven.tar.gz" | sha256sum -c - echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
FROM BASE_IMAGE AS OPENJDK7_DOWNLOAD_IMAGE FROM BASE_IMAGE AS OPENJDK7_DOWNLOAD_IMAGE
ENV OPENJDK7_URL 'https://cdn.azul.com/zulu/bin/zulu7.36.0.5-ca-jdk7.0.252-linux_x64.tar.gz' ENV OPENJDK7_URL 'https://cdn.azul.com/zulu/bin/zulu7.36.0.5-ca-jdk7.0.252-linux_x64.tar.gz'

6
dev-support/hbase_docker/Dockerfile
View File

@ -31,12 +31,12 @@ RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
ENV MAVEN_VERSION='3.5.4' ENV MAVEN_VERSION='3.6.3'
ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" ENV MAVEN_URL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
ENV MAVEN_SHA256 'ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d' ENV MAVEN_SHA512 'c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0'
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \ RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz "${MAVEN_URL}" && \
echo "${MAVEN_SHA256} */tmp/maven.tar.gz" | sha256sum -c - echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE
ENV OPENJDK8_URL 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz' ENV OPENJDK8_URL 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz'

6
pom.xml
View File

@ -1409,10 +1409,14 @@
<!-- default: run small & medium, medium with 2 threads --> <!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart> <surefire.skipSecondPart>false</surefire.skipSecondPart>
<!-- Fork count varies w/ CPU count. Setting is conservative. Up this <!-- Fork count varies w/ CPU count. Setting is conservative mostly determined
by what apache jenkins nightly builds will tolerate (See HBASE-24072). Up this
value is you want to burn through tests faster (could make for more failures value is you want to burn through tests faster (could make for more failures
if more contention around resources). There is a matching MAVEN_ARG if more contention around resources). There is a matching MAVEN_ARG
in our yetus personality where we set the maven -T command to 0.25C too. in our yetus personality where we set the maven -T command to 0.25C too.
For example, to run at a rate that is more furious than our 0.25C, do
something like this:
f="0.5C" ; mvn -T$f -Dsurefire.firstPartForkCount=$f -Dsurefire.secondPartForkCount=$f test -PrunAllTests
--> -->
<surefire.firstPartForkCount>0.25C</surefire.firstPartForkCount> <surefire.firstPartForkCount>0.25C</surefire.firstPartForkCount>
<surefire.secondPartForkCount>0.25C</surefire.secondPartForkCount> <surefire.secondPartForkCount>0.25C</surefire.secondPartForkCount>