Added the ability for jobs to disable themselves when necessary. Made the container job disable itself. Renamed the container name to be shorter.

Author: MiYanni

.vsts-ci.yml

@@ -64,7 +64,7 @@ extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
     containers:
-      azureLinux30Net10BuildAmd64:
+      azureLinux30Amd64:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
 
     sdl:
@@ -192,7 +192,7 @@ extends:
               runTests: false
             ### musl ###
             - categoryName: musl
-              container: azureLinux30Net10BuildAmd64
+              container: azureLinux30Amd64
               runtimeIdentifier: linux-musl-x64
               publishArgument: $(_publishArgument)
               officialBuildProperties: $(_officialBuildProperties)
@@ -201,14 +201,18 @@ extends:
               # SBOM generation is not supported for alpine.
               enableSbom: false
               runTests: false
+              # Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
+              disableJob: true
             - categoryName: musl
-              container: azureLinux30Net10BuildAmd64
+              container: azureLinux30Amd64
               targetArchitecture: arm
               runtimeIdentifier: linux-musl-arm
               publishArgument: $(_publishArgument)
               officialBuildProperties: $(_officialBuildProperties)
               osProperties: /p:OSName=linux-musl
               runTests: false
+              # Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
+              disableJob: true
             - categoryName: musl
               targetArchitecture: arm64
               runtimeIdentifier: linux-musl-arm64

.vsts-pr.yml

@@ -27,7 +27,7 @@ variables:
 
 resources:
   containers:
-  - container: azureLinux30Net10BuildAmd64
+  - container: azureLinux30Amd64
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
 
 stages:

eng/pipelines/templates/jobs/sdk-job-matrix.yml

@@ -12,10 +12,9 @@ parameters:
     runTestsAsTool: true
     # This job uses the build step for testing, so the extra test step is not necessary.
     runTests: false
-  # Turn off template engine runs on Windows temporarily until agent images are updated
-  #- categoryName: TemplateEngine
-  #  testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
-  #  publishXunitResults: true
+  - categoryName: TemplateEngine
+    testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
+    publishXunitResults: true
   - categoryName: AoT
     runAoTTests: true
   ### LINUX ###
@@ -29,10 +28,12 @@ parameters:
     # Don't run the tests on arm64. Only perform the build itself.
     runTests: false
   - categoryName: ContainerBased
-    container: azureLinux30Net10BuildAmd64
+    container: azureLinux30Amd64
     helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-24.04-helix-amd64
     osProperties: /p:OSName=linux /p:BuildSdkDeb=true
     runTests: true
+    # Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
+    disableJob: true
   - categoryName: TemplateEngine
     osProperties: $(linuxOsglibcProperties)
     testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
@@ -64,19 +65,22 @@ jobs:
 # The parameters sent to this template are also passed to the job, which does include the os-specific jobParameterSets array, but that array itself isn't used in the job.
 - ${{ if eq(parameters.pool.os, 'windows') }}:
   - ${{ each jobParameters in parameters.windowsJobParameterSets }}:
-    - template: /eng/pipelines/templates/jobs/sdk-build.yml
-      parameters:
-        ${{ insert }}: ${{ parameters }}
-        ${{ insert }}: ${{ jobParameters }}
+    - ${{ if not(jobParameters.disableJob) }}:
+      - template: /eng/pipelines/templates/jobs/sdk-build.yml
+        parameters:
+          ${{ insert }}: ${{ parameters }}
+          ${{ insert }}: ${{ jobParameters }}
 - ${{ if eq(parameters.pool.os, 'linux') }}:
   - ${{ each jobParameters in parameters.linuxJobParameterSets }}:
-    - template: /eng/pipelines/templates/jobs/sdk-build.yml
-      parameters:
-        ${{ insert }}: ${{ parameters }}
-        ${{ insert }}: ${{ jobParameters }}
+    - ${{ if not(jobParameters.disableJob) }}:
+      - template: /eng/pipelines/templates/jobs/sdk-build.yml
+        parameters:
+          ${{ insert }}: ${{ parameters }}
+          ${{ insert }}: ${{ jobParameters }}
 - ${{ if eq(parameters.pool.os, 'macOS') }}:
   - ${{ each jobParameters in parameters.macOSJobParameterSets }}:
-    - template: /eng/pipelines/templates/jobs/sdk-build.yml
-      parameters:
-        ${{ insert }}: ${{ parameters }}
-        ${{ insert }}: ${{ jobParameters }}
+    - ${{ if not(jobParameters.disableJob) }}:
+      - template: /eng/pipelines/templates/jobs/sdk-build.yml
+        parameters:
+          ${{ insert }}: ${{ parameters }}
+          ${{ insert }}: ${{ jobParameters }}