From a3d42c2600341b95948527ab3b8ff14d8dfe29d1 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Wed, 12 Mar 2025 17:56:00 +0400 Subject: [PATCH 1/3] 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/3] 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/3] 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