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 archive taps as a single jar file #1027

Merged
merged 2 commits into from
May 9, 2024
Merged

Conversation

sophia-guo
Copy link
Contributor

@sophia-guo sophia-guo commented May 7, 2024

Tap files per platforms keep as before.

Parts of adoptium/aqa-tests#5242

@sophia-guo sophia-guo marked this pull request as draft May 7, 2024 18:53
Copy link

github-actions bot commented May 7, 2024

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

@sophia-guo
Copy link
Contributor Author

@sophia-guo sophia-guo self-assigned this May 8, 2024
@sophia-guo sophia-guo marked this pull request as ready for review May 8, 2024 17:36
Tap files per platforms keep as before.

Signed-off-by: Sophia Guo <[email protected]>
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, this is superior to the current approach which is use the Jenkins GUI to download the folder as a single zip file.
aqavitTaps

@sophia-guo
Copy link
Contributor Author

This is only for upstream pipeline job (e.g. openjdk-pipeline), which zips all tap files under different directory of target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}/AQAvitTaps/. The tar preserves the directory structure.

Nothing is changed to build job, the zip file for build job can still use the Jenkins GUI to download .

pipelines/build/common/build_base_file.groovy Outdated Show resolved Hide resolved
@karianna karianna merged commit e694798 into adoptium:master May 9, 2024
5 checks passed
@@ -968,6 +968,16 @@ class Builder implements Serializable {
throw new Exception("[ERROR] Archive artifact timeout (${pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT} HOURS) for ${downstreamJobName}has been reached. Exiting...")
}

// Archive tap files as a single tar file
context.sh "find . -type f -name '*.tap' -exec tar -czf AQAvitTapFiles.tar.gz {} + "
Copy link
Contributor

Choose a reason for hiding this comment

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

Given a sufficient number of *.tap files, find will run tar more than once, the result being that the archive only contains the last batch of *.tap files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @keithc-ca . You are correct. Will update

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants