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 release Tap collection and upload url #1134

Merged
merged 5 commits into from
Nov 8, 2024
Merged

Conversation

sophia-guo
Copy link
Contributor

Add release Tap collection and upload url to ease the Tap file collection process

Copy link

github-actions bot commented Nov 4, 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 sophia-guo self-assigned this Nov 4, 2024
artifactsToCopy = URLEncoder.encode(artifactsToCopy, 'UTF-8')
def javaVersion=determineReleaseToolRepoVersion()
releaseToolUrl += "&VERSION=${javaVersion}&TAG=${tag}&ARTIFACTS_TO_COPY=${artifactsToCopy}"
releaseSummary.appendText("<li><a href=${releaseToolUrl}> RELEASE TEST RESULTS TAPs Link</a></li>")
Copy link
Contributor

@llxia llxia Nov 4, 2024

Choose a reason for hiding this comment

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

Please add a flag to control this. This will not work for Semeru.

  • we do not use ci-jenkins-pipelines to trigger release testing anymore
  • we do not have TAP_Collection job

Copy link
Contributor

Choose a reason for hiding this comment

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

We've used "If Adopt" code before. You'll have to test to see if it works in this file.
https://github.com/search?q=repo%3Aadoptium%2Fci-jenkins-pipelines%20%22JENKINS_URL.contains(%27adopt%27)%22&type=code

@llxia
Copy link
Contributor

llxia commented Nov 4, 2024

cc @AdamBrousseau for awareness

@sophia-guo
Copy link
Contributor Author

Updated to work with adoptium only

@@ -1034,6 +1034,21 @@ class Builder implements Serializable {
if (publish || release) {
if (release) {
context.println 'NOT PUBLISHING RELEASE AUTOMATICALLY, PLEASE SEE THE RERUN RELEASE PUBLISH BINARIES LINKS'
if (context.HUDSON_URL.contains('adoptium')) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm guessing HUDSON_URL works because it is already being used here. But I would think we should probably use JENKINS_URL. I'm not sure if HUDSON_URL will go away someday.

@@ -788,7 +788,7 @@ class Builder implements Serializable {
def osArch = 'all available OS&ARCHs'
def artifactsToCopy = '**/temurin/*.tar.gz,**/temurin/*.zip,**/temurin/*.sha256.txt,**/temurin/*.msi,**/temurin/*.pkg,**/temurin/*.json,**/temurin/*.sig'
def dryRun = false
def String releaseToolUrl = "${context.HUDSON_URL}job/build-scripts/job/release/job/refactor_openjdk_release_tool/parambuild?"
def String releaseToolUrl = "${context.JENKINS_URL}job/build-scripts/job/release/job/refactor_openjdk_release_tool/parambuild?"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use def or String, but not both. See https://groovy-lang.org/style-guide.html#_def_and_type

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.

minor spelling to fix, otherwise LGTM

@@ -1034,6 +1034,21 @@ class Builder implements Serializable {
if (publish || release) {
if (release) {
context.println 'NOT PUBLISHING RELEASE AUTOMATICALLY, PLEASE SEE THE RERUN RELEASE PUBLISH BINARIES LINKS'
if (context.JENKINS_URL.contains('adoptium')) {
releaseSummary.appendText('</ul>', false)
releaseSummary.appendText("<b>TAPs COLLECTION and REALEASE:</b><ul>")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
releaseSummary.appendText("<b>TAPs COLLECTION and REALEASE:</b><ul>")
releaseSummary.appendText("<b>TAP files COLLECTION and RELEASE:</b><ul>")

@sophia-guo sophia-guo merged commit 2f8b53d into adoptium:master Nov 8, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants