-
-
Notifications
You must be signed in to change notification settings - Fork 72
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
Special case jdk8u Solaris beta trigger #1169
Special case jdk8u Solaris beta trigger #1169
Conversation
Signed-off-by: Andrew Leonard <[email protected]>
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 GuidelinesIf you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before. TestsGithub 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 |
Signed-off-by: Andrew Leonard <[email protected]>
Signed-off-by: Andrew Leonard <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM and it'll be obvious if this goes in and doesn't work - one suggestions that you can take or leave as you wish :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Also, I noticed that (on line 88) we prioritise the jdk##.groovy file over the jdk##u.groovy file (last I checked, we should always prioritise the "u" file):
configFile = "jdk${javaVersion}${configSet}.groovy"
def rc = sh(script: "curl --fail -LO ${targetConfigPath}/${configFile}", returnStatus: true)
if (rc != 0) {
echo "Error loading ${targetConfigPath}/${configFile}, trying ${targetConfigPath}/jdk${javaVersion}u${configSet}.groovy"
configFile = "jdk${javaVersion}u${configSet}.groovy"
rc = sh(script: "curl --fail -LO ${targetConfigPath}/${configFile}", returnStatus: true)
if (rc != 0) {
echo "Error loading ${targetConfigPath}/${configFile}"
}
}
Should we replace that with this?
configFile = "jdk${javaVersion}u${configSet}.groovy"
def rc = sh(script: "curl --fail -LO ${targetConfigPath}/${configFile}", returnStatus: true)
if (rc != 0) {
echo "Error loading ${targetConfigPath}/${configFile}, trying ${targetConfigPath}/jdk${javaVersion}${configSet}.groovy"
configFile = "jdk${javaVersion}${configSet}.groovy"
rc = sh(script: "curl --fail -LO ${targetConfigPath}/${configFile}", returnStatus: true)
if (rc != 0) {
echo "Error loading ${targetConfigPath}/${configFile}"
} else {
echo "${targetConfigPath}/${configFile} loaded successfully"
}
}
It's an optional inclusion. So long as we only have the u or non-u config files (not both), this should never be a problem for us.
Heya, I don't seem to be able to see any suggestions. |
Create a beta trigger job for Solaris required for adoptium/infrastructure#3742