Skip to content
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.

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

[OPENJDK-3587] Rebase ELS container images (RHEL9) #532

Merged

Conversation

vieiro
Copy link
Collaborator

@vieiro vieiro commented Jan 17, 2025

  • Rebased on ubi9.
  • Bump container version.
  • Use FROM: registry.access.redhat.com/ubi9/ubi-minimal

Thanks for submitting your Pull Request!

Please make sure your PR meets the following requirements:

  • A JIRA issue must exist in the OPENJDK project at issues.redhat.com
  • Pull Request title should be prefixed with the JIRA issue: [OPENJDK-XYZ] Subject
  • Pull Request contains hyperlink to the JIRA issue
  • Pull Request contains description of the issue
  • Pull Request does not include fixes for issues other than the main ticket
  • Attached commits represent units of work and are properly formatted
  • You have read and agreed to the Developer Certificate of Origin (DCO) (see CONTRIBUTING.md)
  • Every commit contains Signed-off-by: Your Name <[email protected]> - use git commit -s

jmtd and others added 17 commits November 13, 2024 14:56
In the redhat/* overrides files, override "from:" to use
the name assigned to RHEL images built via OSBS from 9.5
onwards.

https://issues.redhat.com/browse/OPENJDK-3430

Signed-off-by: Jonathan Dowland <[email protected]>
The repository has moved: update references.

https://issues.redhat.com/browse/OPENJDK-3414

Signed-off-by: Jonathan Dowland <[email protected]>
…-test-applications

[OPENJDK-3414] Update refs to openjdk-test-applications
…FROM

[OPENJDK-3430] alter FROM line for redhat builds
Signed-off-by: Jonathan Dowland <[email protected]>
The changes in this fork are integrated upstream.

https://issues.redhat.com/browse/OPENJDK-3450

Signed-off-by: Jonathan Dowland <[email protected]>
This test is designed to run a custom s2i/assemble script provided by
the application source. That script prints the string "appsrc-provided
s2i assemble script executed" during execution. Expand the test to check
for this string to ensure the script has been executed.

Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-3450] Stop using fork of behave-test-steps
[OPENJDK-3453] Ensure custom s2i script is run in test
The default path within images for S2I scripts is /usr/libexec/s2i.
Some tools, in some circumstances, will try to execute scripts in
that path. Create a symlink so they work.

For RHEL10, we'll move the scripts to that location.

https://issues.redhat.com/browse/OPENJDK-2805

Signed-off-by: Jonathan Dowland <[email protected]>
…path-ubi9

[OPENJDK-2805] Symlink /usr/libexec/s2i
Update cekit/actions-setup-cekit to v1.1.7
This test seems to stall, especially for the runtime images.

https://issues.redhat.com/browse/OPENJDK-3536

Signed-off-by: Jonathan Dowland <[email protected]>
…-test

[OPENJDK-3536] temporarily disable flaky test
- Rebased on ubi9.
- Bump container version.
- Use FROM: registry.access.redhat.com/ubi9/ubi-minimal

Signed-off-by: Antonio Vieiro <[email protected]>
@vieiro vieiro force-pushed the feature/jdk-11-els-rhel9-2025-01-cpu branch from 970b1f9 to edfe147 Compare January 17, 2025 11:52
@vieiro vieiro changed the title [SUSTAINING-471] Rebase ELS container images (RHEL9) [OPENJDK-3587] Rebase ELS container images (RHEL9) Jan 17, 2025
@vieiro
Copy link
Collaborator Author

vieiro commented Jan 17, 2025

Let me know if you prefer different commits/PR for these changes. Thanks!

Copy link
Member

@jmtd jmtd left a comment

Choose a reason for hiding this comment

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

LGTM - but I think you will also want the following change,
374c13b
in your case i would make the change directly to the FROM in the image descriptors rather than put it into the override files.

@vieiro
Copy link
Collaborator Author

vieiro commented Jan 22, 2025

Yeah, I think I'll sync with latest upgrades

- Use registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal in image descriptors.

Signed-off-by: Antonio Vieiro <[email protected]>
@jmtd jmtd merged commit 26c87f3 into rh-openjdk:jdk11-els-rhel9 Jan 22, 2025
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants