diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index 7f70212..ffc725f 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -18,12 +18,6 @@ RUN mkdir /build/bootjdk /build/dist \ && tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \ && 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 git clone --single-branch --depth 1 \ @@ -39,7 +33,6 @@ RUN bash configure \ --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack" RUN make all JOBS=$(nproc) -RUN make install # 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 @@ -54,31 +47,6 @@ 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,\ 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/src/openj9/test -ENV DIAGNOSTICLEVEL=nodetails -ENV NATIVE_TEST_LIBS=/build/src/build/linux-x86_64-server-release/images/test - -RUN cd /build/src/openj9/test \ - && git clone https://github.com/adoptium/TKG.git - -WORKDIR /build/src/openj9/test/TKG - -ENV BUILD_LIST=functional - -RUN find ../ -type f -name "playlist.xml" | xargs sed -i 's#jit_jar#jit_jarhttps://github.com/#g' -RUN find ../ -type f -name "playlist.xml" | xargs sed -i 's#testJITServer#testJITServerhttps://github.com/#g' - -RUN make compile -j$(nproc) - -RUN make genParallelList PARALLEL_OPTIONS=TEST=_sanity.functional.regular TEST_TIME= NUM_MACHINES=$(nproc) - -RUN cat parallelList.mk - -RUN make -f parallelList.mk JOBS=$(nproc) - WORKDIR /build/src/build/linux-x86_64-server-release/images RUN mv ./* /build/dist/