From a3d42c2600341b95948527ab3b8ff14d8dfe29d1 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Wed, 12 Mar 2025 17:56:00 +0400 Subject: [PATCH 1/4] actually run tests --- Dockerfile.openj9 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index ae66ec9..5205ebe 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -58,19 +58,18 @@ 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 git clone --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git /build/test -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 /test +RUN git clone https://github.com/adoptium/TKG.git . + +RUN make compile -j$(nproc) +RUN make _all WORKDIR /build/src/build/linux-x86_64-server-release/images RUN mv ./* /build/dist/ - # ------ FROM ubuntu:25.04 AS run From 0f664ede953d1adedea060bee92b5a543717ee47 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Wed, 12 Mar 2025 18:06:40 +0400 Subject: [PATCH 2/4] fix: test root --- Dockerfile.openj9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index 5205ebe..27d05da 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -58,7 +58,7 @@ 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 --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git /build/test +RUN git clone --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git "$TEST_ROOT" WORKDIR /test From 7e9f9175f2911b007c9e327d2c21bc83f1d0f1e9 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Wed, 12 Mar 2025 18:12:36 +0400 Subject: [PATCH 3/4] fix git clone TKG attempt 2 --- Dockerfile.openj9 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index 27d05da..c39ea85 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -50,19 +50,17 @@ 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/openj9-repo/test ENV DIAGNOSTICLEVEL=nodetails -RUN git clone --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git "$TEST_ROOT" +WORKDIR /build/openj9-repo/test +RUN git clone --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git . +RUN git clone https://github.com/adoptium/TKG.git -WORKDIR /test - -RUN git clone https://github.com/adoptium/TKG.git . +WORKDIR TKG RUN make compile -j$(nproc) RUN make _all From 701c628244b9c957d3f0d158004195910426f33d Mon Sep 17 00:00:00 2001 From: nm17 Date: Wed, 12 Mar 2025 18:30:22 +0400 Subject: [PATCH 4/4] ci: an idea --- .forgejo/workflows/build_and_release.yml | 7 ++++-- Dockerfile.openj9 | 30 +++++++++++++++++------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/build_and_release.yml b/.forgejo/workflows/build_and_release.yml index 0442526..695cf86 100644 --- a/.forgejo/workflows/build_and_release.yml +++ b/.forgejo/workflows/build_and_release.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: ['main'] + pull_request: env: @@ -24,9 +24,11 @@ jobs: - dockerfile: 'Dockerfile.openj9' image_name: 'openj9' context: './' + build-args: ["WITH_JDK=false"] - dockerfile: 'Dockerfile.piped' image_name: 'piped' context: './' + build-args: [] # Add more images as needed steps: @@ -66,4 +68,5 @@ jobs: file: ${{ matrix.images.dockerfile }} push: ${{ github.event_name == 'push' }} tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file + labels: ${{ steps.meta.outputs.labels }} + build-args: ${{ matrix.images.build-args }} \ No newline at end of file diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index ae66ec9..66ebf66 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -33,7 +33,11 @@ RUN git clone --single-branch --depth 1 \ WORKDIR /build/src RUN bash get_source.sh -RUN bash configure --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack" +RUN bash configure \ + --enable-libffi-bundling --enable-ddr --enable-jitserver \ + --enable-fallback-linker --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 install @@ -55,17 +59,27 @@ 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 TEST_ROOT=/build/src/openj9/test ENV DIAGNOSTICLEVEL=nodetails +ENV NATIVE_TEST_LIBS=/build/src/build/linux-x86_64-server-release/images/test -RUN git clone --depth=1 https://github.com/eclipse-openj9/openj9.git /build/openj9-repo +RUN cd /build/src/openj9/test \ + && git clone https://github.com/adoptium/TKG.git -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/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/