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

Update bisheng JDK_IMPL to hotspot #2589

Merged
merged 1 commit into from
May 26, 2021
Merged

Conversation

eapenzhan
Copy link
Contributor

Bisheng JDK is hotspot implementation.
This change can passed JDK_IMPL as "hotspot" to jenkins job when bisheng is tested, I think.

Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

At some point we need to resolve the TODO in https://github.com/adoptium/temurin-build/blob/921ec1893c2611d5b7865d2b83be418ec3c5831e/test/functional/buildAndPackage/src/net/adoptium/test/VendorPropertiesTest.java#L55 in order to perform the smoke test checks properly but this should resolve the immediate problem :-)

@sxa sxa requested a review from smlambert May 25, 2021 10:24
@smlambert
Copy link
Contributor

Based on the comment above, is this PR addressing a particular smoke test failure? If so, will be good to reference it somewhere.

If this PR is to resolve an immediate problem of smoke tests that should not target Bisheng, then possibly use vendor tag,
re: #2589 (review) - that is now resolved via adoptium/TKG#142 where vendor support is added to playlists, where we use System.getProperty('java.vendor') as the value in the playlist if its not 'known' by a case in the case statement.

@smlambert
Copy link
Contributor

Reference to the Slack discussion to give context to this PR: https://adoptium.slack.com/archives/C09NW3L2J/p1621579653024100

@adamfarley
Copy link
Contributor

TLDR: This PR was to fix a problem where a smoke test job was run against a bisheng build, but would fail immediately because the detected JDK implementation (hotspot) didn't match the JDK_IMPL parameter (bisheng) passed from the build job.

Details

Smoke test error message:

19:49:18  /home/jenkins/workspace/build-scripts/jobs/jdk11u/jdk11u-linux-x64-bisheng_SmokeTests/openjdk-tests/TKG/../TKG/envSettings.mk:39: *** DETECTED_JDK_IMPL value is hotspot, settled JDK_IMPL value is bisheng. JDK_IMPL value does not match. Please reset or unset JDK_IMPL.  Stop.

Underlying cause: The test job template incorrectly identified bisheng as a discrete JDK implementation, as opposed to a variant on the hotspot implementation. In this context, the latter would be more appropriate.

Solution: The proposed "correct" behaviour was to follow the trend laid down by corretto, dragonwell, etc, by having the bisheng smoke tests' default value for JDK_IMPL set to "hotspot".

@sxa
Copy link
Member

sxa commented May 26, 2021

@smlambert Are you happy with this change now that the context has been clarified?

@smlambert smlambert merged commit 734f3bb into adoptium:master May 26, 2021
SAY-droid427 pushed a commit to SAY-droid427/openjdk-tests that referenced this pull request Jun 17, 2021
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.

5 participants