Skip to content

Commit 25f82f3

Browse files
authored
Replace Ubuntu 18 images with Ubuntu 20 in ARM 64 runs (#104689)
* Disable (No)ClientCert_DefaultValue_ResumeSucceeds only on Ubuntu 18 ARM * Update ubuntu images to 20.04 instead * Use Ubuntu 22.04 * Revert "Use Ubuntu 22.04" This reverts commit 0d42116.
1 parent 72d00a8 commit 25f82f3

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ jobs:
7070
# Linux arm64
7171
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
7272
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
73-
- (Ubuntu.1804.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
73+
- (Ubuntu.2004.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
7474
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
75-
- (Ubuntu.1804.Arm64)Ubuntu.2004.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
75+
- (Ubuntu.2004.Arm64)Ubuntu.2004.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
7676

7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:

src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ await TestConfiguration.WhenAllOrAnyFailedWithTimeout(
134134
server.Dispose();
135135
}
136136

137-
[ConditionalTheory]
137+
[Theory]
138138
[MemberData(nameof(SslProtocolsData))]
139-
[ActiveIssue("https://github.com/dotnet/runtime/issues/103354", typeof(PlatformDetection), nameof(PlatformDetection.IsArmOrArm64Process))]
140139
public Task NoClientCert_DefaultValue_ResumeSucceeds(SslProtocols sslProtocol)
141140
{
142141
SslServerAuthenticationOptions serverOptions = new SslServerAuthenticationOptions
@@ -189,9 +188,8 @@ public static TheoryData<SslProtocols, bool, ClientCertSource> ClientCertTestDat
189188
return data;
190189
}
191190

192-
[ConditionalTheory]
191+
[Theory]
193192
[MemberData(nameof(ClientCertTestData))]
194-
[ActiveIssue("https://github.com/dotnet/runtime/issues/103354", typeof(PlatformDetection), nameof(PlatformDetection.IsArmOrArm64Process))]
195193
public Task ClientCert_DefaultValue_ResumeSucceeds(SslProtocols sslProtocol, bool certificateRequired, ClientCertSource certSource)
196194
{
197195
SslServerAuthenticationOptions serverOptions = new SslServerAuthenticationOptions

0 commit comments

Comments
 (0)