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

exclude JDK23+ and jdknext openj9 xmac testing on mac10 #5688

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

llxia
Copy link
Contributor

@llxia llxia commented Oct 15, 2024

related: #5686 (comment)

@llxia
Copy link
Contributor Author

llxia commented Oct 15, 2024

JDK11
JDK23
next

image

LABEL += "&&!sw.os.mac.10"
// assume if JDK_VERSION is set to next, JDK_VERSION is 23+
if (params.JDK_IMPL == "openj9" && PLATFORM == "x86-64_mac" && params.JDK_VERSION) {
if (params.JDK_VERSION.equalsIgnoreCase("next") || params.JDK_VERSION.toInteger() >= 23) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be using isInteger() rather than make a special case for "next".

                if (!params.JDK_VERSION.isInteger() || params.JDK_VERSION.toInteger() >= 23) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

@pshipton
Copy link
Contributor

The grinder states "With AUTO_DETECT=on, JDK_VERSION value is required only if SDK_RESOURCE=nightly/releases. Otherwise, please leave it empty." Setting it to next with AUTO_DETECT off won't work.

@llxia
Copy link
Contributor Author

llxia commented Oct 15, 2024

Description With AUTO_DETECT=on, JDK_VERSION value is required only if SDK_RESOURCE=nightly/releases. Otherwise, please leave it empty. in Grinder is outdated. I will update it.

The test pipeline cannot consume next, so it will try to get Java version and set it at a later stage. AUTO_DETECT has to be set when using JDK_VERSION=next.

@llxia llxia marked this pull request as ready for review October 15, 2024 20:05
@pshipton
Copy link
Contributor

What does "JDK_VERSION=next" mean? Does it have special meaning, or is it just ignored and we could set any non-integer value?

@llxia
Copy link
Contributor Author

llxia commented Oct 15, 2024

JDK_VERSION=next means no JDK_VERSION is set in the test pipeline. The test pipeline will try to figure out JDK_VERSION value at a later stage (TKG level) if AUTO_DETECT is on.

JDK_VERSION=next was initially introduced as the upstream pipeline cannot set the correct JDK_VERSION in the test pipeline.

@LongyuZhang LongyuZhang merged commit 0b30f84 into adoptium:master Oct 15, 2024
2 checks passed
llxia added a commit to llxia/openjdk-tests that referenced this pull request Oct 17, 2024
LongyuZhang pushed a commit that referenced this pull request Oct 17, 2024
* exclude JDK23+ and jdknext openj9 xmac testing on mac10 (#5688)

Signed-off-by: Lan Xia <[email protected]>

* Support Semeru Artifactoriy SDK URL for releases (#5697)

resolves: #5696 and automation/issues/82

Signed-off-by: Lan Xia <[email protected]>

* Remove support for semeru-runtimes/api (#5700)

related: #5696 and automation/issues/82

Signed-off-by: Lan Xia <[email protected]>

---------

Signed-off-by: Lan Xia <[email protected]>
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.

4 participants