Skip to content

Commit 945568a

Browse files
committed
Add smoke tests for Ubunti 26.04
1 parent 8492722 commit 945568a

2 files changed

Lines changed: 21 additions & 10 deletions

File tree

tracer/build/_build/SmokeTests/SmokeTestScenarios.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxX64InstallerScenarios()
6464
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
6565
{
6666
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
67+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
6768
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
6869
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy", "jammy", true),
6970
(TargetFramework.NET5_0, "mcr.microsoft.com/dotnet/aspnet", "5.0-focal", "focal", true),
@@ -251,6 +252,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxArm64InstallerScenarios(
251252
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
252253
{
253254
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
255+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
254256
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
255257
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-bookworm-slim", "bookworm", true),
256258
(TargetFramework.NET7_0, "mcr.microsoft.com/dotnet/aspnet", "7.0-bullseye-slim", "bullseye", true),
@@ -331,8 +333,8 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxChiseledInstallerScenari
331333

332334
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion)[]
333335
{
334-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble-chiseled", "noble"),
335-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble-chiseled-composite", "noble"),
336+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute-chiseled", "resolute"),
337+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute-chiseled-composite", "resolute"),
336338
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble-chiseled", "noble"),
337339
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble-chiseled-composite", "noble"),
338340
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy-chiseled", "jammy"),
@@ -349,8 +351,8 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxChiseledArm64InstallerSc
349351

350352
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion)[]
351353
{
352-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble-chiseled", "noble"),
353-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble-chiseled-composite", "noble"),
354+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute-chiseled", "resolute"),
355+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute-chiseled-composite", "resolute"),
354356
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble-chiseled", "noble"),
355357
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble-chiseled-composite", "noble"),
356358
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy-chiseled", "jammy"),
@@ -370,7 +372,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxNuGetScenarios()
370372
runtimeId: "linux-x64",
371373
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
372374
{
373-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
375+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
374376
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-bookworm-slim", "bookworm", true),
375377
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
376378
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy", "jammy", true),
@@ -453,7 +455,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxNuGetArm64Scenarios()
453455
runtimeId: "linux-arm64",
454456
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
455457
{
456-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
458+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
457459
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-bookworm-slim", "bookworm", true),
458460
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
459461
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-bookworm-slim", "bookworm", true),
@@ -500,6 +502,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxAzureFunctionsNuGetScena
500502
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion)[]
501503
{
502504
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble"),
505+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute"),
503506
(TargetFramework.NET6_0, "mcr.microsoft.com/dotnet/aspnet", "6.0-bullseye-slim", "bullseye"),
504507
});
505508

@@ -535,7 +538,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxDotnetToolScenarios()
535538
runtimeId: "linux-x64",
536539
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
537540
{
538-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
541+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
539542
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-bookworm-slim", "bookworm", true),
540543
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
541544
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy", "jammy", true),
@@ -609,7 +612,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxDotnetToolArm64Scenarios
609612
runtimeId: "linux-arm64",
610613
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
611614
{
612-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble", true),
615+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute", true),
613616
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-bookworm-slim", "bookworm", true),
614617
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble", true),
615618
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy", "jammy", true),
@@ -690,7 +693,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxDotnetToolNugetScenarios
690693
runtimeId: "linux-x64",
691694
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion, bool RunCrashTest)[]
692695
{
693-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/sdk", "10.0-noble", "noble", true),
696+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/sdk", "10.0-resolute", "resolute", true),
694697
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/sdk", "9.0-bookworm-slim", "bookworm", true),
695698
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/sdk", "9.0-noble", "noble", true),
696699
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/sdk", "8.0-jammy", "jammy", true),
@@ -733,7 +736,7 @@ static IEnumerable<IEnumerable<SmokeTestScenario>> LinuxTrimmingScenarios()
733736
runtimeId: "linux-x64",
734737
scenarios: new (string PublishFramework, string Image, string Tag, string OsVersion)[]
735738
{
736-
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-noble", "noble"),
739+
(TargetFramework.NET10_0, "mcr.microsoft.com/dotnet/aspnet", "10.0-resolute", "resolute"),
737740
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-noble", "noble"),
738741
(TargetFramework.NET9_0, "mcr.microsoft.com/dotnet/aspnet", "9.0-bookworm-slim", "bookworm"),
739742
(TargetFramework.NET8_0, "mcr.microsoft.com/dotnet/aspnet", "8.0-jammy", "jammy"),

tracer/build/_build/SmokeTests/smoke-test-images.docker-compose.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ services:
8787
image: mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled@sha256:f43461f1774d09e4da09014531b8098547ea601a8552958dee2f977f8c1842b5
8888
aspnet-10_0-noble-chiseled-composite:
8989
image: mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-composite@sha256:a6fe6804ff2189b5d214c774263ca93f54667db79d1e3363fcf2b509308d7a7f
90+
aspnet-10_0-resolute:
91+
image: mcr.microsoft.com/dotnet/aspnet:10.0-resolute@sha256:b965591286f770de7de91212a10a89ea11f3c76a4b932e68b2fcc4997a8c6d65
92+
aspnet-10_0-resolute-chiseled:
93+
image: mcr.microsoft.com/dotnet/aspnet:10.0-resolute-chiseled@sha256:55afa8b2cd461111410aaf64121357a5d66f2fae1633602e40aab5f0d3337c76
94+
aspnet-10_0-resolute-chiseled-composite:
95+
image: mcr.microsoft.com/dotnet/aspnet:10.0-resolute-chiseled-composite@sha256:99a3e8f30bc9be1beac726e1a7086a4c3416ee532770f3524b079bc4db4b2a0e
9096
aspnet-10_0-windowsservercore-ltsc2022:
9197
image: mcr.microsoft.com/dotnet/aspnet:10.0-windowsservercore-ltsc2022@sha256:17c963b25ddba67ae6dc11882deeddff67910d7ea7bb8ac63453beb9ea5177cd
9298

@@ -121,6 +127,8 @@ services:
121127
image: mcr.microsoft.com/dotnet/sdk:10.0-alpine3.22@sha256:bb9890f2f2dbefa91b161feecfe6f85fd4c8c9e3933158c54287f37f611d5ed5
122128
sdk-10_0-noble:
123129
image: mcr.microsoft.com/dotnet/sdk:10.0-noble@sha256:8a90a473da5205a16979de99d2fc20975e922c68304f5c79d564e666dc3982fc
130+
sdk-10_0-resolute:
131+
image: mcr.microsoft.com/dotnet/sdk:10.0-resolute@sha256:ac75136590a2dd39dc5856bd3cc1fd774ac3c17ec229f72894f3f26a59f80878
124132

125133
# andrewlock/dotnet-centos
126134
dotnet-centos-7-2_1:

0 commit comments

Comments
 (0)