Disable QUIC tests on alpine arm32 #99020
Conversation
ghost
assigned 
|
Tagging subscribers to this area: @dotnet/ncl Issue DetailsContributes to #91757 The previous workaround was to fix msquic on 2.2.2 on Alpine Arm32, however, that can only be done up to 3.16 included. Alpine 3.17+ uses OpenSSL 3, but some of the required changes (dotnet/msquic#149 (comment) and dotnet/msquic#151) were only introduced post 2.2.2. WHich means we cannot use that workaround on 3.17+ anymore. In order to unblock #98531, we have to put all the Alpine Arm32 QUIC tests under (cc @rzikm this should also make things easier for #98361)
|
|
Per #99849 (comment) we also need this change in the 8.0 branch. |
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: /~https://github.com/dotnet/runtime/actions/runs/8348612385 |
|
@carlossanlop backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: disable quic tests on alpine arm32
Using index info to reconstruct a base tree...
M src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs
A src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs
M src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
M src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs
M src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs
M src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs
M src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
CONFLICT (modify/delete): src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs deleted in HEAD and modified in disable quic tests on alpine arm32. Version disable quic tests on alpine arm32 of src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs left in tree.
Auto-merging src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 disable quic tests on alpine arm32
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! |
|
@carlossanlop an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* Update Alpine versions * Backport [#99020] Disable QUIC tests on alpine arm32 --------- Co-authored-by: Natalia Kondratyeva <knatalia@microsoft.com>
Contributes to #91757
The previous workaround was to fix msquic on 2.2.2 on Alpine Arm32 (dotnet/dotnet-buildtools-prereqs-docker#933), however, that can only be done up to 3.16 included. Alpine 3.17+ uses OpenSSL 3, but some of the required changes (dotnet/msquic#149 (comment) and dotnet/msquic#151) were only introduced post 2.2.2. WHich means we cannot use that workaround on 3.17+ anymore.
In order to unblock #98531, we have to put all the Alpine Arm32 QUIC tests under
ActiveIssue(#91757).(cc @rzikm this should also make things easier for #98361)