ci: add --with-jtreg
Some checks failed
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.piped image_name:piped]) (push) Successful in 14s
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.openj9 image_name:openj9]) (push) Failing after 11m14s

This commit is contained in:
Даниил 2025-03-09 20:09:54 +04:00
parent bd8708ec76
commit 404dec0f40
Signed by: nm17
GPG key ID: 3303B70C59145CD4

View file

@ -2,13 +2,13 @@ FROM ubuntu:25.04 AS build
# partly copied from mkdocker.sh # partly copied from mkdocker.sh
# Copyright IBM Corp (Eclipse Public License 2.0) # Copyright IBM Corp (Eclipse Public License 2.0)
RUN apt update \ RUN apt -qq update \
&& apt upgrade -y \ && apt -qq upgrade -y \
&& apt install -qq -y --no-install-recommends \ && apt -qq install -y --no-install-recommends \
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc-14 g++-14 gdb git \ ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc-14 g++-14 gdb git \
libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \ libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \
libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \ libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack \ make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack unzip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /build WORKDIR /build
@ -18,6 +18,12 @@ RUN mkdir /build/bootjdk /build/dist \
&& tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \ && tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \
&& rm -f jdk21.tar.gz && rm -f jdk21.tar.gz
RUN wget --progress=dot:mega -O jtreg.zip https://builds.shipilev.net/jtreg/jtreg-7.5.1%2B1.zip \
&& unzip jtreg.zip -d /build \
&& rm -rf jtreg.zip
ENV JT_HOME=/build/jtreg
RUN find /build/bootjdk -name '*.so' | xargs execstack -c RUN find /build/bootjdk -name '*.so' | xargs execstack -c
RUN git clone --single-branch --depth 1 \ RUN git clone --single-branch --depth 1 \
@ -27,9 +33,9 @@ RUN git clone --single-branch --depth 1 \
WORKDIR /build/src WORKDIR /build/src
RUN bash get_source.sh RUN bash get_source.sh
RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack" RUN bash configure --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
RUN make all JOBS=$(nproc) RUN make all JOBS=$(nproc)
RUN make test TEST=tier2 JOBS=$(nproc) RUN make install
# jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/ # jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/
WORKDIR /build/src/build/linux-x86_64-server-release/images WORKDIR /build/src/build/linux-x86_64-server-release/images
@ -44,6 +50,24 @@ jdk.nio.mapmode,jdk.random,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsu
jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\ jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\
openj9.sharedclasses,openj9.zosconditionhandling openj9.sharedclasses,openj9.zosconditionhandling
ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
ENV TEST_ROOT=/build/openj9-repo/test
ENV DIAGNOSTICLEVEL=nodetails
RUN git clone --depth=1 https://github.com/eclipse-openj9/openj9.git /build/openj9-repo
RUN cd /build/openj9-repo/test \
&& git clone https://github.com/adoptium/TKG.git \
&& cd TKG \
&& make compile -j$(nproc) \
&& make _sanity.openjdk.regular -j$(nproc)
WORKDIR /build/src/build/linux-x86_64-server-release/images
RUN mv ./* /build/dist/ RUN mv ./* /build/dist/
@ -53,7 +77,7 @@ FROM ubuntu:25.04 AS run
COPY --from=build /build/dist/jre /usr/lib/jvm/openj9-jre COPY --from=build /build/dist/jre /usr/lib/jvm/openj9-jre
ENV JAVA_HOME=/usr/lib/jvm/openj9-jre ENV JAVA_HOME=/usr/lib/jvm/openj9-jre
ENV PATH="$JAVA_HOME/bin:$PATH" ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
# verify installation # verify installation
RUN java --version RUN java --version