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

Add logic to process platform specific exclude files #4486

Merged
merged 2 commits into from
May 10, 2023

Conversation

Mesbah-Alam
Copy link
Contributor

@Mesbah-Alam Mesbah-Alam commented Mar 29, 2023

  • Pass in dev(common and platform specific) and fips exclude lists via customJtx.
  • Use ${SPEC} to determine platform.
  • Remove logic to process comma separated testflags.
  • Clean up code.
  • Related backlog/issues/1029

@Mesbah-Alam Mesbah-Alam force-pushed the add-plats-jtx branch 3 times, most recently from 0615ff1 to efbff2c Compare March 30, 2023 17:25
@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented Mar 30, 2023

Test with sanity

  • JDK8 : Grinder_JCK/1265
  • JDK11 : Grinder_JCK/1262
  • JDK17 : Grinder_JCK/1263
  • JDK19 : Grinder_JCK/1264
  • JDK20 : Grinder_JCK/1260

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented Mar 30, 2023

Note: This PR can only be delivered after corresponding directory structure changes to all tck repo's have been made.

@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review March 30, 2023 18:24
@Mesbah-Alam Mesbah-Alam requested review from llxia and smlambert March 30, 2023 18:24
@Mesbah-Alam Mesbah-Alam marked this pull request as draft March 31, 2023 16:46
@Mesbah-Alam Mesbah-Alam force-pushed the add-plats-jtx branch 19 times, most recently from e7c853b to 3c3bb6d Compare April 3, 2023 18:02
@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review April 4, 2023 16:23
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

@Mesbah-Alam Mesbah-Alam force-pushed the add-plats-jtx branch 2 times, most recently from d7dcf5d to c4365ba Compare April 12, 2023 19:20
@Mesbah-Alam
Copy link
Contributor Author

Note, this branch has been rebased and following update has been made to the change added by #4506: platform.contains("win") -> spec.contains("win") - since this PR replaces 'platform' with 'spec'.

Sanity check with one tck target on 17: Grinder/32286 (green).

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented Apr 13, 2023

Suggesting: whenever it's safe to merge, please leave this PR to be merged by me; since its delivery needs to be coordinated with those of the related PRs for tck repo's (to make the corresponding changes to the repo's). Internal tck builds will break otherwise.

@karianna karianna marked this pull request as draft April 14, 2023 00:20
@karianna
Copy link
Contributor

Converted to Draft to prevent early merging

@llxia
Copy link
Contributor

llxia commented Apr 20, 2023

Just for the record, we have decided to merge this PR after the release as the related repo structure is also needed to be updated to correspond to this change. Once the changes are made, it is not backward compatible. The changes only affect IBM.

After the release,

  • a branch will be created in the related repo before restructuring so we have a backup and future reference if ever needed. The branch should be matching with the AQA release branch (i.e., v0.9.7-release)
  • merge this PR
  • restructuring related repo for exclude files in the main branch (PR corresponding change)
  • test build will continue to run via the main branch

@Mesbah-Alam Mesbah-Alam force-pushed the add-plats-jtx branch 12 times, most recently from 4515918 to a2ad93c Compare April 25, 2023 16:22
@Mesbah-Alam Mesbah-Alam force-pushed the add-plats-jtx branch 2 times, most recently from 593f947 to f356b3c Compare May 9, 2023 16:09
Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review May 9, 2023 17:15
@Mesbah-Alam
Copy link
Contributor Author

Re: #4486 (comment)

  • v0.9.7-release branch has been created for each internal tck repo.
  • fips jtx files in the related PRs for TCK 11 and 17 repos have been updated to include all latest changes to fips excludes.
  • Sanity tested with jck-runtime-api-java_nio - a target that has excluded sub-tests : Grinder/32793.

@smlambert
Copy link
Contributor

Temurin-compliance /Grinder/3474/

@Mesbah-Alam Mesbah-Alam merged commit 407df1e into adoptium:master May 10, 2023
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