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

July infra rollout: Move runtime tests out of the coreclr folder (2nd attempt) #38058

Merged
merged 2 commits into from
Jul 8, 2020

Conversation

trylek
Copy link
Member

@trylek trylek commented Jun 17, 2020

I have messed up my previous version of this change as of #37995 while rebasing the change against current master. The current expectation is that the change is going to be merged in around 7/6 i.e. at the July infra rollout, fixing the bug #37440.

Thanks

Tomas

Fixes: #37440

/cc: @dotnet/runtime-infrastructure

@ghost
Copy link

ghost commented Jun 17, 2020

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

@safern
Copy link
Member

safern commented Jun 17, 2020

@trylek does this include the runtimetests subset update in runtime.yml + running the coreclr tests when that changed?

@trylek
Copy link
Member Author

trylek commented Jun 17, 2020

@safern - not yet, working on that right now to make this a third PR feedback commit.

@trylek trylek force-pushed the CoreCLRTestMoveInMaster branch from 0c847f3 to db91329 Compare June 17, 2020 23:27
@trylek
Copy link
Member Author

trylek commented Jun 17, 2020

@safern - hopefully fixed, can you please take another look when you have a chance?

@trylek trylek force-pushed the CoreCLRTestMoveInMaster branch from 02fa61e to b028598 Compare June 18, 2020 08:45
@trylek trylek force-pushed the CoreCLRTestMoveInMaster branch 4 times, most recently from e4a3983 to e2677c9 Compare July 7, 2020 23:17
@trylek
Copy link
Member Author

trylek commented Jul 7, 2020

@dotnet/runtime-infrastructure - I believe I'm finally out of the woods w.r.t. the weird difference between PR and CI runs of the change due to an omission in build-test.sh (not passing unprocessed build args to msbuild). I have triggered a CoreCLR outerloop run and I intend to coordinate tomorrow European morning with @ViktorHofer on finally merging the change in unless I hear objections - I would love to avoid further delays if possible, I hit two conflicts just this afternoon during lab testing, the change is vast and the test churn makes it really painful.

Thanks a lot

Tomas

@@ -598,6 +602,7 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true),
Copy link
Member

Choose a reason for hiding this comment

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

Just double checking to refresh my memory, libraries tests are needed for runtime tests, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we need any library test build artifacts for building or running runtime tests, just the libraries build. I can easily remove this line if you believe it's superfluous, I guess I'll probably catch a few more conflicts before the night is over, I just hope that around PST midnight the churn will calm down a bit. I'm not going to update the PR right away as that would cancel the running tests and that would be a waste of lab resources considering this is ultimately just a "perf optimization".

Copy link
Member

Choose a reason for hiding this comment

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

I think we can update this as a subsequent PR to not risk getting more merge conflicts.

Copy link
Member

@safern safern left a comment

Choose a reason for hiding this comment

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

Skimmed through

@trylek
Copy link
Member Author

trylek commented Jul 8, 2020

One more comment - I'm planning to merge this in without squashing i.e. as two commits, one doing the mechanical move and another with the script patches, for easier orientation. Please let me know if for whatever reason you find a full squash merge preferable.

trylek added 2 commits July 8, 2020 10:10
(*) Path changes in the test build scripts;
(*) Modify runtime.yml filtering based on Nathan's and Santi's feedback;
(*) Fix runtime pipeline filtering clauses per Santi's PR feedback;
(*) Fix path to Coreclr.TestWrapper.csproj;
(*) Pass unprocessed build args to test wrapper creation;
(*) Fix missing $(TestRoot) on groups in Pri0 test build mode.

Thanks

Tomas
@trylek trylek force-pushed the CoreCLRTestMoveInMaster branch from e2677c9 to b64d1b4 Compare July 8, 2020 08:11
@trylek trylek merged commit 54a09d2 into dotnet:master Jul 8, 2020
@trylek trylek deleted the CoreCLRTestMoveInMaster branch July 8, 2020 09:48
@echesakov echesakov mentioned this pull request Jul 10, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

July infra rollout: move tests shared between coreclr and mono from src/coreclr/tests/src to src/tests
3 participants