Skip to content

[Backport 7.72.x] Replace openjdk images with amazoncorretto docker images #21841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2025
Merged

[Backport 7.72.x] Replace openjdk images with amazoncorretto docker images #21841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hudi/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def dd_environment():
compose_file = os.path.join(HERE, 'docker', 'docker-compose.yaml')
with docker_run(
compose_file=compose_file,
conditions=[CheckDockerLogs('spark-app-hudi', 'finished: show at script.scala:163')],
conditions=[CheckDockerLogs('spark-app-hudi', 'finished: show at script.scala')],
attempts=5,
Comment on lines 16 to 20
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Wait condition exits after first Spark show instead of job completion

The readiness gate now looks for the generic substring finished: show at script.scala. CheckDockerLogs matches regexes anywhere in the log output, so this will succeed on the very first show() statement executed in script.scala. The Hudi test script performs several subsequent writes/reads before entering its idle loop, and the e2e test asserts JMX metrics that are produced by those later operations. By returning from docker_run after the first show, the test can start before the remaining Hudi work has finished, introducing race‑condition failures when the metrics are still missing. The original pattern with the explicit line number ensured the check waited for the final show call.

Useful? React with 👍 / 👎.

attempts_wait=5,
):
Expand Down
4 changes: 2 additions & 2 deletions hudi/tests/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jdk-alpine
FROM amazoncorretto:8-alpine-jdk

ARG SPARK_VERSION
ARG HADOOP_VERSION
Expand All @@ -12,7 +12,7 @@ RUN apk add --no-cache curl bash \
&& rm spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz \
&& cd /

RUN wget -O - https://github.com/sbt/sbt/releases/download/v1.4.1/sbt-1.4.1.tgz | gunzip | tar -x -C /usr/local
RUN wget -O - https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz | gunzip | tar -x -C /usr/local

ENV PATH /usr/local/sbt/bin:${PATH}

Expand Down
7 changes: 5 additions & 2 deletions quarkus/tests/docker/micrometer-quickstart/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Use the official JDK 19 image as the base image for the build stage
FROM openjdk:19-jdk AS build
FROM amazoncorretto:19-al2-jdk AS build

# Install curl for Maven wrapper downloads (fallback if maven-wrapper.jar is missing)
RUN yum install -y curl && yum clean all

# Enable preview features
ENV JAVA_OPTS="--enable-preview"
Expand Down Expand Up @@ -33,7 +36,7 @@ RUN ./mvnw package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -B -V


# Use the official JDK 19 image as the base image for the runtime stage
FROM openjdk:19-jdk AS runtime
FROM amazoncorretto:19-al2-jdk AS runtime

# Enable preview features
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager --enable-preview"
Expand Down
Loading