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

Add support for decompression of tar.xz in get.sh #5762

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

sxa
Copy link
Member

@sxa sxa commented Nov 19, 2024

Fixes #4374

A couple of points:

  • Do we have a requirement for this for the debugimage etc.? I've covered it in this PR regardless
  • We do not guarantee that xz is on any given machine - maybe we should add it ... At the moment it'll just fail to extract with a message along the lines ofxz: not found or similar.

@sxa sxa self-assigned this Nov 19, 2024
@smlambert
Copy link
Contributor

The initial reason for the creation of #4374 to support xz was to support testing RHBO since it is packaged in that way (differently from the many other distributions that we support the testing of...).

In that sense, I would not say it is a 'hard requirement' for us. It is certainly a nice to have for those wishing to test artifacts that are compressed in that way. I am not aware of a requirement for debugimage at the moment, but certainly fine to include it.

@@ -367,6 +367,12 @@ getBinaryOpenjdk()
for file_name in "${jdk_file_array[@]}"
do
if [[ ! "$file_name" =~ "sbom" ]]; then
if [[ $file_name == *xz ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we make the check more specific? Instead of checking xz, check
if [[ $file_name == *.tar.xz ]]; then

Copy link
Member Author

Choose a reason for hiding this comment

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

The primary reason for not doing that is that .txz is also used by some people (same as .tgz is often used as a shorted .tar.gz), so this would catch that situation too .

@sxa sxa changed the title Add support for decompression tar.xz in get.sh Add support for decompression of tar.xz in get.sh Nov 20, 2024
@llxia
Copy link
Contributor

llxia commented Nov 20, 2024

Please provide a Grinder link.

@sxa
Copy link
Member Author

sxa commented Nov 20, 2024

Please provide a Grinder link.

For what specifically?

@smlambert
Copy link
Contributor

Minimally 2 Grinders would be good, 1 to verify common use cases are unaffected, 1 to verify this works to decompress a RHBO from the marketplace would be helpful.

@smlambert
Copy link
Contributor

and apologies, we've just merged Andrew's PR, so you'll need to resolve the conflicts in the get.sh file

@sxa
Copy link
Member Author

sxa commented Nov 20, 2024

Minimally 2 Grinders would be good, 1 to verify common use cases are unaffected, 1 to verify this works to decompress a RHBO from the marketplace would be helpful.

I figured I'd fire off an "upstream" one too to make sure those artifacts all work: https://ci.adoptium.net/job/Grinder/11608/

Hopefully that's adequate :-)

@sxa
Copy link
Member Author

sxa commented Nov 20, 2024

and apologies, we've just merged Andrew's PR, so you'll need to resolve the conflicts in the get.sh file

Ah yes ... that's unfortunate

@sxa
Copy link
Member Author

sxa commented Nov 20, 2024

Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

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

thanks @sxa

Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

@llxia llxia merged commit 22677f8 into adoptium:master Nov 20, 2024
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.

Add support for testing JDK binaries packaged in tar.xz format
3 participants