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

Remove Win7 Helix queues #100981

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Remove Win7 Helix queues #100981

merged 1 commit into from
Apr 12, 2024

Conversation

jkoritzinsky
Copy link
Member

Due to changing internal requirements, Helix is decomissioning the Win7 queues.

As a result, we need to stop sending work to them before they are turned off (as any build that uses them after that point will fail.

This will need to be backported.

Copy link
Contributor

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

@akoeplinger
Copy link
Member

akoeplinger commented Apr 12, 2024

note that release/6.0 has one more usage in the file so that needs to be removed too while backporting

@jkoritzinsky
Copy link
Member Author

/backport to release/8.0-staging

@jkoritzinsky
Copy link
Member Author

/backport to release/7.0-staging

Copy link
Contributor

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/8666367290

Copy link
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/8666368321

@jkoritzinsky
Copy link
Member Author

/backport to release/6.0-staging

Copy link
Contributor

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/8666369668

Copy link
Contributor

@jkoritzinsky backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove Win7 Helix queues
Using index info to reconstruct a base tree...
M	eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove Win7 Helix queues
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@jkoritzinsky an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

jkoritzinsky added a commit that referenced this pull request Apr 12, 2024
Backport of #100981 to release/6.0-staging

## Customer Impact

- [ ] Customer reported
- [X] Found internally

Due to changing internal requirements, Helix is decomissioning the Win7 queues.

As a result, we need to stop sending work to them before they are turned off (as any build that uses them after that point will fail.

## Regression

- [ ] Yes
- [X] No

## Testing

Infrastructure-only removal of a queue, no testing necessary.

## Risk

Low: Simple removal of a Helix queue. We do lose some test coverage, but we can't keep the queue around.

**IMPORTANT**: If this backport is for a servicing release, please verify that:

- The PR target branch is `release/X.0-staging`, not `release/X.0`.

- If the change touches code that ships in a NuGet package, you have added the necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.
@jkoritzinsky
Copy link
Member Author

/ba-g Slow mac issue

@jkoritzinsky jkoritzinsky merged commit 4cca6f1 into dotnet:main Apr 12, 2024
73 of 79 checks passed
@jkoritzinsky jkoritzinsky deleted the remove-win7 branch April 12, 2024 23:37
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
@github-actions github-actions bot locked and limited conversation to collaborators May 13, 2024
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.

3 participants