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

Infrastructure: correct dependencies and clean helix agent from stray corerun procs #54094

Merged
merged 3 commits into from
Jun 13, 2021

Conversation

hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Jun 12, 2021

@ghost
Copy link

ghost commented Jun 12, 2021

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

Issue Details
Author: hoyosjs
Assignees: -
Labels:

area-Infrastructure-coreclr

Milestone: -

@ghost ghost added this to In Progress in Infrastructure Backlog Jun 12, 2021
@hoyosjs hoyosjs linked an issue Jun 12, 2021 that may be closed by this pull request
Copy link
Member

@kunalspathak kunalspathak left a comment

Choose a reason for hiding this comment

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

LGTM with minor suggestions.

src/coreclr/scripts/superpmi.proj Outdated Show resolved Hide resolved
@@ -68,6 +68,11 @@
<HelixPreCommand Condition="'$(TargetsWindows)' != 'true' and '$(BrowserHost)' != 'windows'" Include="export MONO_ENV_OPTIONS='$(MonoEnvOptions)'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetsWindows)' == 'true' or '$(BrowserHost)' == 'windows'">
<HelixPreCommand Include="taskkill.exe /f /im corerun.exe"/>
Copy link
Member

Choose a reason for hiding this comment

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

Can we also add similar command for unix?

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'd rather get this in sooner rather than later given the stability issues. I am not sure if all unix systems we have can use pkill, otherwise something like ps aux | grep -i corerun | grep -v grep | awk '{ print $2 }' | xargs kill -9 would work.

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense. Lets get this in first.

Co-authored-by: Kunal Pathak <Kunal.Pathak@microsoft.com>
@hoyosjs
Copy link
Member Author

hoyosjs commented Jun 13, 2021

cc: @dotnet/runtime-infrastructure

@ghost
Copy link

ghost commented Jun 13, 2021

Hello @hoyosjs!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@hoyosjs
Copy link
Member Author

hoyosjs commented Jun 13, 2021

Merging this as this is blocking all arm64 runs.

@hoyosjs hoyosjs merged commit 86cebb3 into dotnet:main Jun 13, 2021
Infrastructure Backlog automation moved this from In Progress to Done Jun 13, 2021
@hoyosjs hoyosjs deleted the juhoyosa/fix-errors-in-infra branch June 13, 2021 20:54
@@ -64,6 +64,8 @@ jobs:
- '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}'
- ${{ if ne(parameters.stagedBuild, true) }}:
- ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter')) }}:
# This is needed for creating a CORE_ROOT in the current design.
Copy link
Member

Choose a reason for hiding this comment

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

courious, shouldn't this be when runtimeFlavor is mono? that way we cover all mono flavors? Or are minjit/monointerpreter always a value for when we are running tests on mono?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's the ones where I saw the issue, I thought about it, but I am not sure how the other mono runs work.

Copy link
Member

Choose a reason for hiding this comment

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

@naricc do you know?

Copy link
Member

Choose a reason for hiding this comment

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

@safern Its just that with minijit/monointerpreter, there is no seperate product build (we only have one build that has both of them). Other runtime variants do have their own package, thus it needs to be parameterized by the runtimeVariant.

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.

Other than one question, LGTM

@ghost ghost locked as resolved and limited conversation to collaborators Jul 15, 2021
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.

Pipeline dependency issue: Artifact CoreCLRProduct bits missing.
4 participants