Skip to content

[Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest and update Prometheus image #9792

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

Jump to bottom
Merged
corgy-w merged 4 commits into from
Aug 30, 2025
Merged

[Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest and update Prometheus image #9792

corgy-w merged 4 commits into from
Aug 30, 2025

Conversation

@dybyte
Copy link
Contributor

@dybyte dybyte commented Aug 28, 2025 •
edited
Loading

Purpose of this pull request

Fix intermittent unit-test CI failures in RestApiHttpsForTruststoreTest caused by HTTP port conflicts by dynamically allocating the HTTP port (excluding the fixed HTTP port).

See BaseServletTest.java
for reference.

2025-08-28T13:14:39.2712140Z [ERROR] Failures:
2025-08-28T13:14:39.2713120Z [ERROR] RestApiHttpsForTruststoreTest.testRestApiHttp:92 Expected java.net.ConnectException to be thrown, but nothing was thrown.

Does this PR introduce any user-facing change?

No

How was this patch tested?

The change is covered by existing tests.

Check list

@dybyte dybyte changed the title [Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest [Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest Aug 28, 2025
Hisoka-X
Hisoka-X previously approved these changes Aug 29, 2025
View reviewed changes
Copy link
Member

@Hisoka-X Hisoka-X left a comment

Choose a reason for hiding this comment

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

Thanks @dybyte

@corgy-w
Copy link
Contributor

corgy-w commented Aug 29, 2025

Thanks @dybyte please retry ci

@dybyte
Copy link
Contributor Author

dybyte commented Aug 29, 2025 •
edited
Loading

@Hisoka-X @corgy-w
I found another error in CI test

2025-08-29T02:59:06.9008164Z [ERROR] Errors: 
2025-08-29T02:59:06.9009150Z [ERROR]   PrometheusIT » Completion org.testcontainers.containers.ContainerLaunchExcepti...

It seems like we may need to change the Docker image from bitnami/prometheus:2.53.0 to bitnamilegacy/prometheus:2.53.0. Bitnami patched their Prometheus image after August 28, so the original image no longer work. What do you think?
More details

@dybyte dybyte changed the title [Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest [Fix][Zeta] Use dynamic port allocation for HTTP in RestApiHttpsForTruststoreTest and update Prometheus image Aug 29, 2025
@Hisoka-X
Copy link
Member

Hisoka-X commented Aug 29, 2025

change the Docker image from bitnami/prometheus:2.53.0 to bitnamilegacy/prometheus:2.53.0

LGTM.

@dybyte
Copy link
Contributor Author

dybyte commented Aug 29, 2025

All CI checks have passed.

@corgy-w corgy-w merged commit 427676d into apache:dev Aug 30, 2025
4 checks passed
@dybyte dybyte deleted the fix/test-rest-api-http branch August 31, 2025 23:30
@Hisoka-X Hisoka-X mentioned this pull request Sep 1, 2025
Merged
3 tasks
@dybyte dybyte mentioned this pull request Sep 2, 2025
Closed
3 tasks
@Hisoka-X Hisoka-X mentioned this pull request Sep 3, 2025
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Hisoka-X Hisoka-X Hisoka-X approved these changes

@corgy-w corgy-w corgy-w approved these changes

Assignees

No one assigned

Labels

approved e2e reviewed Zeta Rest API Zeta

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dybyte @corgy-w @Hisoka-X