OPENJDK-3591 merge back jlink #556
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]>
https://issues.redhat.com/browse/OPENJDK-2595 Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-2595] fix docs labels for JDK21
[OPENJDK-2177] Move behave tests to relevant modules
…ule/jdk/ Signed-off-by: Jayashree Huttanagoudar <[email protected]>
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
…urce repository https://github.com/jboss-container-images/openjdk-test-applications Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2177] Delete OPENJDK-1549 as it is already moved to new test application source repository
Signed-off-by: Adriano Machado <[email protected]>
…riate modules Signed-off-by: Jayashree Huttanagoudar <[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]>
Clean up run script
…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
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
Signed-off-by: Jonathan Dowland <[email protected]>
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
jmtd
force-pushed
the
3591-merge-back-jlink
branch
from
405d2b8 to
762880c
Compare
|
As of 762880c , behave test results from a local build (and local test run) are 'the |
|
test results on internal build (inc. s2i tests) internal build pushed to quay.io/jdowland/openjdk-21-jlink-rhel9-tech-preview:latest |
sefroberg
suggested changes
Feb 25, 2025
There was a problem hiding this comment.
I think you are attempting this merge in a more complicated way than it needs to be. Try just branch to branch merge?
I see a delta of 75 commits in 73 files here: jlink-dev...ubi9
Closed
8 tasks
jmtd
force-pushed
the
3591-merge-back-jlink
branch
from
762880c to
3af343e
Compare
|
Updated the merge commit with some fixes (thanks to @sefroberg for helping me spot them):
|
|
behave test status on current state of this PR (3af343e): The test tagging is not quite right (not enough tests running); that may also be a problem in the the two test failures are jlink specific and point at problems in this merge. digging further. |
|
The jlink-specific tests are broken in edit: tracker for one broken test is https://issues.redhat.com/browse/OPENJDK-3647 and the other https://issues.redhat.com/browse/OPENJDK-3038 (Fixes in #564) Likewise test tagging edit: test tagging is tracked in https://issues.redhat.com/browse/OPENJDK-3598 |
|
build from this branch |
|
Here we go! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges ubi9 into jlink-dev and resolves the conflicts.
https://issues.redhat.com/browse/OPENJDK-3591