Clean out Ubuntu 16.04 testing #32894
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pilchie
added
the
area-infrastructure
dougbu
commented
May 21, 2021
eng/targets/Helix.targets
Outdated
Comment on lines
17
to
18
| Debian.9.Amd64.Open; | ||
| Debian.9.Amd64; |
There was a problem hiding this comment.
Debian.9.Amd64.Open was previously duplicated.
| Ubuntu.1804.Amd64.Open | ||
| Windows.10.Amd64.Open | ||
| Ubuntu.2004.Amd64.Open | ||
| Windows.10.Amd64.Server20H2.Open |
There was a problem hiding this comment.
Windows.10.Amd64.Open exists but we use Windows.10.Amd64.Server20H2.Open by default in real life. Matching that here.
- use Ubuntu 18.04 agents for testing in Docker containers on Helix nit: clean up a few old mentions of Centos and Fedora testing
dougbu
commented
May 21, 2021
|
The https://dev.azure.com/dnceng/public/_build/results?buildId=1150252&view=results run passed in the job this PR affects. Ready for review… |
dougbu
force-pushed
the
dougbu/quit.Ubuntu.16.04
branch
from
3ed9592 to
82f907b
Compare
HaoK
approved these changes
May 21, 2021
ghost
added this to the
|
/backport to release/3.1 |
|
/backport to release/5.0 |
|
Started backporting to release/3.1: https://github.com/dotnet/aspnetcore/actions/runs/877386328 |
|
Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/877386702 |
|
@dougbu backporting to release/3.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix
Using index info to reconstruct a base tree...
M .azure/pipelines/jobs/default-build.yml
A .azure/pipelines/quarantined-pr.yml
M docs/Helix.md
A eng/scripts/RunHelix.ps1
M eng/targets/Helix.Common.props
M eng/targets/Helix.targets
M src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
CONFLICT (content): Merge conflict in src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
Auto-merging eng/targets/Helix.targets
CONFLICT (content): Merge conflict in eng/targets/Helix.targets
Auto-merging eng/targets/Helix.Common.props
CONFLICT (content): Merge conflict in eng/targets/Helix.Common.props
CONFLICT (modify/delete): eng/scripts/RunHelix.ps1 deleted in HEAD and modified in Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix. Version Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix of eng/scripts/RunHelix.ps1 left in tree.
Auto-merging docs/Helix.md
CONFLICT (content): Merge conflict in docs/Helix.md
CONFLICT (modify/delete): .azure/pipelines/quarantined-pr.yml deleted in HEAD and modified in Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix. Version Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix of .azure/pipelines/quarantined-pr.yml left in tree.
Auto-merging .azure/pipelines/jobs/default-build.yml
CONFLICT (content): Merge conflict in .azure/pipelines/jobs/default-build.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 Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix
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 128Please backport manually! |
|
@dougbu backporting to release/5.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix
Using index info to reconstruct a base tree...
M .azure/pipelines/jobs/default-build.yml
M .azure/pipelines/quarantined-pr.yml
M docs/Helix.md
M eng/scripts/RunHelix.ps1
M eng/targets/Helix.Common.props
M eng/targets/Helix.targets
M src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
Auto-merging eng/targets/Helix.targets
CONFLICT (content): Merge conflict in eng/targets/Helix.targets
Auto-merging eng/targets/Helix.Common.props
CONFLICT (content): Merge conflict in eng/targets/Helix.Common.props
Auto-merging eng/scripts/RunHelix.ps1
CONFLICT (content): Merge conflict in eng/scripts/RunHelix.ps1
Auto-merging docs/Helix.md
CONFLICT (content): Merge conflict in docs/Helix.md
Auto-merging .azure/pipelines/quarantined-pr.yml
Auto-merging .azure/pipelines/jobs/default-build.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 Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix
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 128Please backport manually! |
dougbu
added a commit
that referenced
this pull request
May 26, 2021
- a variant of #32894 - use Ubuntu 18.04 agents for testing in Docker containers on Helix - remove use of old Centos and Debian queues - move to newer OSX.1014.Amd64.Open queue and Fedora.33.Amd64.Open Docker image - add a couple of queues we test against in 'main'
dougbu
added a commit
that referenced
this pull request
May 27, 2021
- backport of #32894 - !temporary! intentionally leave merge conflict indicators * Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix nits: - clean up a few old mentions of Centos and Fedora testing - fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - don't mention unused internal queues in `$(TestDependsOnPlaywright)` update of `$(SkipHelixQueues)` - sort remaining queues alphabetically in `$(SkipHelixQueues)`
dougbu
added a commit
that referenced
this pull request
May 27, 2021
- cherry-pick of #32894 * Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix - also move to supported version of Fedora * Support added `msbuild` arguments in RunHelix.ps1 - bring in part of 0551cef (#32554) - no reason to maintain major differences from main version of script - slight difference is we still test on Windows.10.Amd64.Open by default here nits: - clean up a few old mentions of Centos and Fedora testing - fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - pick up a small bit of the master -> main renaming improvements - use `[switch]` instead of `[bool]` in RunHelix.ps1 parameters
dougbu
added a commit
that referenced
this pull request
Jun 1, 2021
* [release/5.0] Clean out Ubuntu 16.04 testing - cherry-pick of #32894 * Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix - also move to supported version of Fedora * Support added `msbuild` arguments in RunHelix.ps1 - bring in part of 0551cef (#32554) - no reason to maintain major differences from main version of script - slight difference is we still test on Windows.10.Amd64.Open by default here nits: - clean up a few old mentions of Centos and Fedora testing - fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - pick up a small bit of the master -> main renaming improvements - use `[switch]` instead of `[bool]` in RunHelix.ps1 parameters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nit: clean up a few old mentions of Centos and Fedora testing