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-3591 merge back jlink #556

Open
wants to merge 76 commits into
base: jlink-dev
Choose a base branch
from

Conversation

jmtd
Copy link
Member

@jmtd jmtd commented Feb 19, 2025

This merges ubi9 into jlink-dev and resolves the conflicts.

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

jmtd and others added 30 commits December 11, 2023 16:22
tzdata is deliberately broken in ubi-minimal images (presumably for
disk space reasons). The fix is to reinstall the tzdata package:

    <https://access.redhat.com/solutions/5616681>

This appears to add a neglibible amount to our image sizes (<1%)
but resolves TZ issues for Java applications.

    <https://issues.redhat.com/browse/OPENJDK-2519>

Signed-off-by: Jonathan Dowland <[email protected]>
Integrate the JLink workflow and scripts into the Ubi9 container sources
…tall

[OPENJDK-2519] Add tzdata module to reinstall tzdata
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2177] Move behave tests to relevant modules
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2177]Create a dummy module.yaml to move openjdk.feature behave test to mod…
Document (as a comment) the issue of ordering pkg-update and
tzdata modules. Depend upon the pkg-update module from tzdata,
to ensure it runs first always. This has no effect on the
container images as they stand now, since they have pkg-config
occurring first already, but if that changed, this would catch
it.

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

[OPENJDK-2519] tzdata module depend upon pkg-update
[OPENJDK-2177] Delete OPENJDK-1549 as it is already moved to new test application source repository
Signed-off-by: Adriano Machado <[email protected]>
…them with appropriate modules

Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2177] Split the tests inside tests/features/java/runtime.feature to couple them with appropriate modules
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2837] Follow-on test clean-up work for ubi9
Add a test which ensures s2i binary-build works with a destination
directory not owned by UID 185 (/var/tmp), which means the running
process does not have permission to change its timestamps,
simulating a random UID and the permissions on /deployments.

Signed-off-by: Jonathan Dowland <[email protected]>
If the S2I build runs as a user other than 185 (such as s2i's default
of 1001), attempting to set the timestamp of /deployments will fail,
causing the build to fail.

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

See also
https://issues.redhat.com/browse/OPENJDK-2408

Signed-off-by: Jonathan Dowland <[email protected]>
…nto run-java.sh

- This tweak is to avoid defining JBOSS_CONTAINER_UTIL_LOGGING_MODULE as ENV in templates/jlink/Dokcerfile
- Deleted run-env.sh and folded its content to run-java.sh as its not doing anything much other than setting value of JAVA_APP_DIR

Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
…GING_MODULE and JBOSS_CONTAINER_JAVA_RUN_MODULE

Signed-off-by: Jayashree Huttanagoudar <[email protected]>
…sts. Instead checks for some common label and image labels are correct. So its good to rename the test.

Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2837] UBI9: Rename the test suitably
jmtd and others added 30 commits October 15, 2024 13:26
[OPENJDK-3351] Pin base image on :9.4 tag
Not JDK11 (EOL)

Signed-off-by: Jonathan Dowland <[email protected]>
Update GitHub Pages URI to reflect new GitHub Organisation
and repository names.

<https://issues.redhat.com/browse/OPENJDK-3390>

Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-3391] Update GitHub Pages URI
[OPENJDK-3410] update self-reference in GitHub pages for new URI
actions/upload-pages-artifact@v1 uses Artifact actions v3 which
will be deprecated on 2024-12-05.

Updating upload-pages-artifact to v3 requires updating deploy-pages
to v4.

Take the opportunity to update configure-pages@v5 as well.

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

Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-3418] Bump GH Pages Actions to recent versions
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
This test checks a custom test application source to ensure that
a custom settings.xml, which defines a custom profile, has been
activated.

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

[OPENJDK-3597] test for MAVEN_SETTINGS_XML
The hsperfdata path is determined by the running user's username.
This is no longer "jboss", but "default". Use "${USER}" so that we
catch any future changes in username.

Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-3637] clean up correct hsperfdata path
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.

4 participants