Compare commits

..

3 commits

Author SHA1 Message Date
7e9f9175f2
fix git clone TKG attempt 2
Some checks failed
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.openj9 image_name:openj9]) (pull_request) Failing after 7s
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.piped image_name:piped]) (pull_request) Failing after 9s
2025-03-12 18:12:36 +04:00
0f664ede95
fix: test root
Some checks failed
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.openj9 image_name:openj9]) (pull_request) Failing after 6s
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.piped image_name:piped]) (pull_request) Failing after 6s
2025-03-12 18:06:40 +04:00
a3d42c2600
actually run tests
Some checks failed
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.piped image_name:piped]) (pull_request) Failing after 6s
Docker Image CI / build-and-push (map[context:./ dockerfile:Dockerfile.openj9 image_name:openj9]) (pull_request) Failing after 8s
2025-03-12 17:56:00 +04:00
2 changed files with 9 additions and 29 deletions

View file

@ -2,7 +2,7 @@ name: Docker Image CI
on:
push:
branches: ['main']
pull_request:
env:
@ -24,11 +24,9 @@ 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:
@ -68,5 +66,4 @@ jobs:
file: ${{ matrix.images.dockerfile }}
push: ${{ github.event_name == 'push' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: ${{ matrix.images.build-args }}
labels: ${{ steps.meta.outputs.labels }}

View file

@ -33,11 +33,7 @@ RUN git clone --single-branch --depth 1 \
WORKDIR /build/src
RUN bash get_source.sh
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 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 install
@ -54,37 +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,\
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 TEST_ROOT=/build/openj9-repo/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/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 /build/src/openj9/test/TKG
ENV BUILD_LIST=functional
RUN find ../ -type f -name "playlist.xml" | xargs sed -i 's#<testCaseName>jit_jar</testCaseName>#<testCaseName>jit_jar</testCaseName><disables><disable><comment>https://github.com/</comment></disable></disables>#g'
RUN find ../ -type f -name "playlist.xml" | xargs sed -i 's#<testCaseName>testJITServer</testCaseName>#<testCaseName>testJITServer</testCaseName><disables><disable><comment>https://github.com/</comment></disable></disables>#g'
WORKDIR TKG
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)
RUN make _all
WORKDIR /build/src/build/linux-x86_64-server-release/images
RUN mv ./* /build/dist/
# ------
FROM ubuntu:25.04 AS run