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

Use configAltPath for jti files #3704

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Conversation

Mesbah-Alam
Copy link
Contributor

@Mesbah-Alam Mesbah-Alam commented May 26, 2022

  • Allows vendor specific jti files to be in internal repos, while the ones in the open can be used by the community.
  • Should be delivered after updates to all internal repos have been made with appropriate config files.

Related : backlog/issues/799

FYI @JasonFengJ9 @llxia @smlambert

Signed-off-by: Mesbah-Alam Mesbah_Alam@ca.ibm.com

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented May 26, 2022

@smlambert - could you please test this PR at your end? Thanks!

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented May 26, 2022

Tested internally with Grinder/24223.

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented May 27, 2022

Internal tck repos have been updated with required changes (ref: backlog/issues/799).

Tests:
8: Grinder/24241
11 : Grinder/24223
17: Grinder/24233
18: Grinder/24237
19: Grinder/24238

@Mesbah-Alam Mesbah-Alam force-pushed the jti-reorg branch 2 times, most recently from 2ee71c3 to 14e8b5b Compare June 2, 2022 17:27
Signed-off-by: Mesbah-Alam <Mesbah_Alam@ca.ibm.com>
@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review June 2, 2022 17:40
@Mesbah-Alam Mesbah-Alam marked this pull request as draft June 2, 2022 17:41
@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented Jun 2, 2022

Update: Moved configAltPath=$(CONFIG_ALT_PATH) from individual playlist targets to JCK_CMD_TEMPLATE in jck.mk as now we'd need to pass that value for all targets.

Tested pr with sanity : Grinder/24467 (green) :

14:49:58  TOTAL: 42   EXECUTED: 40   PASSED: 40   FAILED: 0   DISABLED: 1   SKIPPED: 1
14:49:58  ALL TESTS PASSED
14:49:58  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
14:49:58  
14:49:58  _sanity.jck done

@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review June 2, 2022 19:11
@smlambert
Copy link
Contributor

smlambert commented Jun 3, 2022

special.jck (as that top-level target heavily utilizes the contents of the default config folder):
jdk8 x64linux: Temurin-compliance Grinder/1338
jdk11 x64mac: Temurin-compliance Grinder/1339
jdk17 x64win: Temurin-compliance Grinder/1340

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.

thanks @Mesbah-Alam

@smlambert smlambert requested a review from llxia June 3, 2022 14:08
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

@llxia llxia merged commit 994763e into adoptium:master Jun 3, 2022
@Mesbah-Alam Mesbah-Alam deleted the jti-reorg branch June 21, 2022 18:48
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.

3 participants