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

jdk23+: Update openjdk test repo and branch setting logic #5642

Closed
sophia-guo opened this issue Sep 24, 2024 · 12 comments · Fixed by #5649
Closed

jdk23+: Update openjdk test repo and branch setting logic #5642

sophia-guo opened this issue Sep 24, 2024 · 12 comments · Fixed by #5649

Comments

@sophia-guo
Copy link
Contributor

Upstream openjdk/jdk now branch rather than forking since jdk23, same as adoptium. Openjdk test repo and branch setting logic needs to update since there will be no repo like https://github.com/adoptium/jdkDDu or https://github.com/adoptium/jdkDD repo for jdk23+

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Sep 24, 2024

Jobs triggered nightly or release by pipeline wont be affected as JDK_REPO and JDK_BRANCH are set by upstream job.

Mainly affects grinder when set JDK_VERSION to grab openjdk repo, i.e. JDK_REPO and JDK_BRANCH are not set.

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Sep 24, 2024

Check if repo jdkDDu exists can be removed. JDKDDu repo will aways be available for versions before jdk23. For jdk23+ repo will be always same as adopitium/jdk, tags are used to refer different versions.

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Sep 24, 2024

For jdk23+ what will be the test senario when using grinder? Should jdk_branch is a must? Otherwise how should the tag be set? For earlier version we set the default branch as dev. For jdk23+ the dev would actually be head master as latest version. @smlambert

Or get the tag from latest release branch testenv.properties if available, if not it will be the head? Other choices is do some extra checks or calculation to match the latest tag per version

@smlambert
Copy link
Contributor

We should keep previous functionality where we default to use the jdkXXu repo and its dev branch, so now our default could be
https://github.com/adoptium/jdk and dev_jdk{$JDK_VERSION} , so dev_jdk23 when no JDK_REPO or JDK_BRANCH is supplied.

@smlambert
Copy link
Contributor

for reference: https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getAvailableReleases

@andrew-m-leonard
Copy link
Contributor

Check if repo jdkDDu exists can be removed. JDKDDu repo will aways be available for versions before jdk23. For jdk23+ repo will be always same as adopitium/jdk, tags are used to refer different versions.

@sophia-guo
Apologies I hadn't seen this earlier, this statement is unfortunately not accurate.

Only the "stabalisation release" is branched in the jdk(head) repo, ie. only jdk-23, jdk-24, jdk-25, ...

"update" releases, ie.jdk-23.0.1, jdk-23.0.2,... will as before be in a forked jdk23u repo: ie. here : https://github.com/openjdk/jdk23u

@andrew-m-leonard
Copy link
Contributor

Ref openjdk maillist on stabilization release branching: https://mail.openjdk.org/pipermail/jdk-dev/2024-March/008834.html

@sophia-guo
Copy link
Contributor Author

@andrew-m-leonard for Adotpium, when or will jdk23u be available? openjdk has https://github.com/openjdk/jdk23u but right now no jdk23u in adoptium. By default openjdk test in aqa-tests will use adoptium repo.

@andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard for Adotpium, when or will jdk23u be available? openjdk has https://github.com/openjdk/jdk23u but right now no jdk23u in adoptium. By default openjdk test in aqa-tests will use adoptium repo.

I shall try and create it in the next few days

@andrew-m-leonard
Copy link
Contributor

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Oct 2, 2024

To simplify ( refer https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getAvailableReleases and https://github.com/adoptium/jdk/branches )

 If it's adoptium/jdkDDu available 
        use adoptium/jdkDDu repo and dev branch 
else if it's tip version
       use adopitum/jdk and dev branch
else
       use adoptium/jdk and dev_jdkversion branch

@andrew-m-leonard is that correct?

@andrew-m-leonard
Copy link
Contributor

To simplify ( refer https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getAvailableReleases and https://github.com/adoptium/jdk/branches )

 If it's adoptium/jdkDDu available 
        use adoptium/jdkDDu repo and dev branch 
else if it's tip version
       use adopitum/jdk and dev branch
else
       use adoptium/jdk and dev_jdkversion branch

@andrew-m-leonard is that correct?

Looks good thanks @sophia-guo

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

Successfully merging a pull request may close this issue.

3 participants