[PERF] Update Perf Android jobs to use the Windows 11 Pixel Queue.#95614
Conversation
|
Tagging subscribers to this area: @directhex Issue DetailsUpdate Perf Android jobs to use the Windows 11 Pixel Queue.
|
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7105378500 |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/7105383164 |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/7105391268 |
|
@LoopedBard3 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: Update Perf Android jobs to use the Windows 11 Pixel Queue.
Using index info to reconstruct a base tree...
M eng/testing/performance/performance-setup.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/testing/performance/performance-setup.ps1
CONFLICT (content): Merge conflict in eng/testing/performance/performance-setup.ps1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Perf Android jobs to use the Windows 11 Pixel Queue.
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! |
|
@LoopedBard3 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. |
Update Perf Android jobs to use the Windows 11 Pixel Queue.
Successful test run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2328997&view=results
This should not have any impact on the test results as this only updates the machine the devices are tethered to.