[OPENJDK-4008] Revert artifacts changes that resulted in use of lookaside cache #595
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
This reverts commit 20a5342.
jmtd
force-pushed
the
OPENJDK-4008-revert-artifacts
branch
2 times, most recently
from
29847f3 to
064362d
Compare
Adjust the permissions of installed files such that files that
should be executable have o+x.
Remove unnecessary chowns and chmods that set g+w etc on files
that should not be modified by running applications anyway.
The results should be:
$ podman run --rm -ti ubi9/openjdk-21:latest find /opt/jboss /usr/local/s2i -type f -printf "%M %u:%g %h/%f\n"
-rw-r--r-- root:root /opt/jboss/container/openjdk/jdk/jvm-options
-rw-r--r-- root:root /opt/jboss/container/s2i/core/s2i-core
-rw-r--r-- root:root /opt/jboss/container/maven/default/maven.sh
-rw-r--r-- root:root /opt/jboss/container/maven/default/jboss-settings.xml
-rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-overrides
-rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-s2i
-rw-r--r-- root:root /opt/jboss/container/java/proxy/proxy-options
-rw-r--r-- root:root /opt/jboss/container/java/proxy/parse-proxy-url.sh
-rw-r--r-- root:root /opt/jboss/container/java/proxy/translate-no-proxy.sh
-rwxr-xr-x root:root /opt/jboss/container/java/run/run-java.sh
-rwxr-xr-x root:root /opt/jboss/container/java/jvm/debug-options
-rwxr-xr-x root:root /opt/jboss/container/java/jvm/java-default-options
-rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-overrides
-rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-s2i-overrides
-rw-r--r-- root:root /opt/jboss/container/java/s2i/s2i-core-hooks
-rw-r--r-- root:root /opt/jboss/container/util/logging/logging.sh
-rwxr-xr-x root:root /usr/local/s2i/run
-rwxr-xr-x root:root /usr/local/s2i/save-artifacts
-rwxr-xr-x root:root /usr/local/s2i/assemble
-rwxr-xr-x root:root /usr/local/s2i/usage
Signed-off-by: Jonathan Dowland <[email protected]>
jmtd
force-pushed
the
OPENJDK-4008-revert-artifacts
branch
from
064362d to
36cbe4a
Compare
|
Tests are good. The failign (error) test for the s2i images is due to the changes made to openjdk-container-test-applications for #593 |
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.
https://issues.redhat.com/browse/OPENJDK-4008
The changes in OPENJDK-3655 (#583) had the unintended side-effect of OSBS builds using the Brew lookaside cache to handle artifacts. We first noticed that this didn't preserve permissions properly (missing +x on scripts) which I initially worked around with some explicit
chmod, but I've now also learned that, since this generates a/sourcesfile, this also breaks the generation of source containers.Revert the move to
artifacts:entirely. Retain the tests we added to check file permissions, and add some further changes (mostly deletions) to ensure the installed files have sensible permissions: +x for all where needed, and not where not; and all ownership is root:root.