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

HBASE-26393 The dockerfile for running pre commit and nightly jobs can not be built on branch-1 (#3790) 

Signed-off-by: Zhuoyue Huang <huangzhuoyue@apache.org>
This commit is contained in:
Duo Zhang 2021-10-23 20:35:12 +08:00 committed by GitHub
parent bcb2829144
commit 57dbad11da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev-support/docker/Dockerfile
View File

@ -19,7 +19,7 @@
# See BUILDING.txt. # See BUILDING.txt.
FROM ubuntu:trusty FROM ubuntu:18.04
WORKDIR /root WORKDIR /root
@ -63,10 +63,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
pylint \ pylint \
python-dateutil \ python-dateutil \
rsync \ rsync \
snappy \ libsnappy-dev \
xz-utils \ xz-utils \
zlib1g-dev \ zlib1g-dev \
wget wget \
gpg \
dirmngr
#### ####
# Apps that require Java. # Apps that require Java.
@ -90,13 +92,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
RUN echo "dot_style = mega" > "/root/.wgetrc" RUN echo "dot_style = mega" > "/root/.wgetrc"
RUN echo "quiet = on" >> "/root/.wgetrc" RUN echo "quiet = on" >> "/root/.wgetrc"
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9
RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common python-software-properties RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common
RUN apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main' RUN apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'
RUN apt-get -q update RUN apt-get -q update
RUN apt-get -q install --no-install-recommends -y zulu-8 zulu-7 RUN apt-get -q install --no-install-recommends -y zulu-8 zulu-7
RUN update-alternatives --config java RUN update-alternatives --config java
RUN update-alternatives --config javac RUN update-alternatives --config javac
RUN mv /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/moved.java-7-openjdk-amd64
ENV JAVA_HOME /usr/lib/jvm/zulu-7-amd64 ENV JAVA_HOME /usr/lib/jvm/zulu-7-amd64
# Fixing the Apache commons / Maven dependency problem under Ubuntu: # Fixing the Apache commons / Maven dependency problem under Ubuntu:

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
View File

@ -172,7 +172,7 @@ public class TestRegionProcessRowsWithLocks {
try { try {
incrementCounter(table); incrementCounter(table);
Assert.fail("Should throw IOException."); Assert.fail("Should throw IOException.");
} catch (Throwable e) { } catch (IOException e) {
} }
long endMemstoreSize = region.getMemstoreSize(); long endMemstoreSize = region.getMemstoreSize();

2
pom.xml
View File

@ -739,6 +739,8 @@
<exclude>**/rat.txt</exclude> <exclude>**/rat.txt</exclude>
<!-- hbase-error-prone module is in a profile which is not used for rat check --> <!-- hbase-error-prone module is in a profile which is not used for rat check -->
<exclude>hbase-error-prone/target/**</exclude> <exclude>hbase-error-prone/target/**</exclude>
<!-- when using jdk7, hbase-thrift module will not be used for rat check -->
<exclude>hbase-thrift/target/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>