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

Changing tag of jar files to BINARY #601

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Conversation

psoujany
Copy link
Contributor

This PR changes file tagging of testDependency *.jar files from IBM-1047 to BINARY. This PR fixes #600

@psoujany
Copy link
Contributor Author

Verified the changes by submitting sanity.functional on z/OS machine.

Job : Grinder_CR/21983/

Tagging with this fix is below
b binary T=off json-simple.jar

@psoujany
Copy link
Contributor Author

@llxia Could you please review this PR. Thank you.

@llxia
Copy link
Contributor

llxia commented Aug 22, 2024

This patch changes jar files tagging to BINARY

Signed-off-by: Pasam Soujanya <psoujany@in.ibm.com>
@psoujany
Copy link
Contributor Author

This fix works fine on non-z/OS and JDK11 as well.
non-z/OS : Grinder_CR/22066/
JDK11 z/OS : Grinder_CR/22069/

@karianna karianna requested a review from llxia August 26, 2024 11:50
@psoujany
Copy link
Contributor Author

@llxia Could you please review this PR, JDK21 testing on z/OS is dependent on this PR. Once the PR is merged we've to remove testDependency folder on all z/OS machines.

@llxia
Copy link
Contributor

llxia commented Aug 28, 2024

non-z/OS : Grinder_CR/22066/

I cannot tell from the Grinder run as there was no downloading and pre-staged jars were used. The PR code was not triggered.

00:06:45.972  downloading dependent third party jars to /home/jenkins/workspace/Grinder_CR/../../testDependency/lib
00:06:45.972  /home/jenkins/workspace/Grinder_CR/../../testDependency/lib/org.eclipse.osgi-3.16.100.jar exists with correct hash, not downloading
00:06:45.972  /home/jenkins/workspace/Grinder_CR/../../testDependency/lib/jtreg_7_4_1.tar.gz exists with correct hash, not downloading
00:06:45.972  /home/jenkins/workspace/Grinder_CR/../../testDependency/lib/byte-buddy-agent.jar exists with correct hash, not downloading
00:06:45.972  /home/jenkins/workspace/Grinder_CR/../../testDependency/lib/json-simple.jar exists with correct hash, not downloading
...

You need to delete the pre-staged jars and ensure the download code is triggered.

@psoujany
Copy link
Contributor Author

@llxia Another job on non-z/OS
Grinder_CR/22188

testDependency/lib$ file -bi *.jar
application/java-archive; charset=binary
application/zip; charset=binary
application/zip; charset=binary
application/java-archive; charset=binary
application/java-archive; charset=binary
application/zip; charset=binary

@llxia
Copy link
Contributor

llxia commented Aug 28, 2024

The above job failed. No test has been executed. Please relaunch.

@psoujany
Copy link
Contributor Author

This job has run properly
Grinder_CR/22216

@llxia llxia merged commit 1b43848 into adoptium:master Aug 29, 2024
3 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.

testDependency jars are improperly tagged when downloaded via curl
3 participants