Skip to content

Commit 40ec933

Browse files
github-actions[bot]wfurtakoeplingerManickaP
authored
[release/10.0] use AZL3 instead of Ubuntu for builds (#125716)
Backport of #125544 to release/10.0 --------- Co-authored-by: wfurt <tweinfurt@yahoo.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com>
1 parent e359ed8 commit 40ec933

9 files changed

Lines changed: 11 additions & 9 deletions

File tree

eng/pipelines/common/xplat-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ jobs:
167167
# Public Linux Build Pool
168168
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
169169
name: $(DncEngPublicBuildPool)
170-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
170+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
171171

172172
# Official Build Linux Pool
173173
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), ne(variables['System.TeamProject'], 'public')) }}:
174174
name: $(DncEngInternalBuildPool)
175-
demands: ImageOverride -equals 1es-ubuntu-2204
175+
demands: ImageOverride -equals build.azurelinux.3.amd64
176176
os: linux
177177

178178
# OSX Public Build Pool (we don't have on-prem OSX BuildPool).

src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace System.Net.Quic.Tests
1111
{
1212
[Collection(nameof(QuicTestCollection))]
13-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
13+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
1414
[SkipOnPlatform(TestPlatforms.Windows, "CipherSuitesPolicy is not supported on Windows")]
1515
public class MsQuicCipherSuitesPolicyTests : QuicTestBase
1616
{

src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace System.Net.Quic.Tests
1414
{
1515
[Collection(nameof(QuicTestCollection))]
16-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
16+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
1717
public class MsQuicRemoteExecutorTests : QuicTestBase
1818
{
1919
public MsQuicRemoteExecutorTests()

src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void Dispose()
4646
}
4747

4848
[Collection(nameof(QuicTestCollection))]
49-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
49+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
5050
public class MsQuicTests : QuicTestBase, IClassFixture<CertificateSetup>
5151
{
5252
private static byte[] s_data = "Hello world!"u8.ToArray();

src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace System.Net.Quic.Tests
1919
using Configuration = System.Net.Test.Common.Configuration;
2020

2121
[Collection(nameof(QuicTestCollection))]
22-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
22+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
2323
public sealed class QuicConnectionTests : QuicTestBase
2424
{
2525
const int ExpectedErrorCode = 1234;

src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace System.Net.Quic.Tests
1515
{
1616
[Collection(nameof(QuicTestCollection))]
17-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
17+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
1818
public sealed class QuicListenerTests : QuicTestBase
1919
{
2020
public QuicListenerTests(ITestOutputHelper output) : base(output) { }

src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace System.Net.Quic.Tests
1616
{
1717
[Collection(nameof(QuicTestCollection))]
18-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
18+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
1919
public sealed class QuicStreamConformanceTests : ConnectedStreamConformanceTests
2020
{
2121
protected override bool UsableAfterCanceledReads => false;

src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace System.Net.Quic.Tests
1414
{
1515
[Collection(nameof(QuicTestCollection))]
16-
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))]
16+
[ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest), nameof(QuicTestBase.IsNotAzureLinux3VM))]
1717
public sealed class QuicStreamTests : QuicTestBase
1818
{
1919
private static byte[] s_data = "Hello world!"u8.ToArray();

src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public abstract class QuicTestBase : IDisposable
3232

3333
public static bool IsSupported => QuicListener.IsSupported && QuicConnection.IsSupported;
3434
public static bool IsNotArm32CoreClrStressTest => !(CoreClrConfigurationDetection.IsStressTest && PlatformDetection.IsArmProcess);
35+
//[ActiveIssue("https://github.com/dotnet/runtime/issues/123216")]
36+
public static bool IsNotAzureLinux3VM => !PlatformDetection.IsAzureLinux || PlatformDetection.IsInContainer;
3537

3638
public static bool IsIPv6Available => Configuration.Sockets.IsIPv6LoopbackAvailable;
3739

0 commit comments

Comments
 (0)