Skip to content

Commit 5b7b6d8

Browse files
authored
Disable the container job and allow jobs to disable themselves (#49849)
2 parents a1a9559 + a2bf7f4 commit 5b7b6d8

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

.vsts-ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extends:
6464
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6565
parameters:
6666
containers:
67-
azureLinux30Net10BuildAmd64:
67+
azureLinux30Amd64:
6868
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
6969

7070
sdl:
@@ -192,7 +192,7 @@ extends:
192192
runTests: false
193193
### musl ###
194194
- categoryName: musl
195-
container: azureLinux30Net10BuildAmd64
195+
container: azureLinux30Amd64
196196
runtimeIdentifier: linux-musl-x64
197197
publishArgument: $(_publishArgument)
198198
officialBuildProperties: $(_officialBuildProperties)
@@ -201,14 +201,18 @@ extends:
201201
# SBOM generation is not supported for alpine.
202202
enableSbom: false
203203
runTests: false
204+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
205+
disableJob: true
204206
- categoryName: musl
205-
container: azureLinux30Net10BuildAmd64
207+
container: azureLinux30Amd64
206208
targetArchitecture: arm
207209
runtimeIdentifier: linux-musl-arm
208210
publishArgument: $(_publishArgument)
209211
officialBuildProperties: $(_officialBuildProperties)
210212
osProperties: /p:OSName=linux-musl
211213
runTests: false
214+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
215+
disableJob: true
212216
- categoryName: musl
213217
targetArchitecture: arm64
214218
runtimeIdentifier: linux-musl-arm64

.vsts-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variables:
2727

2828
resources:
2929
containers:
30-
- container: azureLinux30Net10BuildAmd64
30+
- container: azureLinux30Amd64
3131
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
3232

3333
stages:

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ parameters:
1212
runTestsAsTool: true
1313
# This job uses the build step for testing, so the extra test step is not necessary.
1414
runTests: false
15-
# Turn off template engine runs on Windows temporarily until agent images are updated
16-
#- categoryName: TemplateEngine
17-
# testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
18-
# publishXunitResults: true
15+
- categoryName: TemplateEngine
16+
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
17+
publishXunitResults: true
1918
- categoryName: AoT
2019
runAoTTests: true
2120
### LINUX ###
@@ -29,10 +28,12 @@ parameters:
2928
# Don't run the tests on arm64. Only perform the build itself.
3029
runTests: false
3130
- categoryName: ContainerBased
32-
container: azureLinux30Net10BuildAmd64
31+
container: azureLinux30Amd64
3332
helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-24.04-helix-amd64
3433
osProperties: /p:OSName=linux /p:BuildSdkDeb=true
3534
runTests: true
35+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
36+
disableJob: true
3637
- categoryName: TemplateEngine
3738
osProperties: $(linuxOsglibcProperties)
3839
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:
6465
# 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.
6566
- ${{ if eq(parameters.pool.os, 'windows') }}:
6667
- ${{ each jobParameters in parameters.windowsJobParameterSets }}:
67-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
68-
parameters:
69-
${{ insert }}: ${{ parameters }}
70-
${{ insert }}: ${{ jobParameters }}
68+
- ${{ if not(jobParameters.disableJob) }}:
69+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
70+
parameters:
71+
${{ insert }}: ${{ parameters }}
72+
${{ insert }}: ${{ jobParameters }}
7173
- ${{ if eq(parameters.pool.os, 'linux') }}:
7274
- ${{ each jobParameters in parameters.linuxJobParameterSets }}:
73-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
74-
parameters:
75-
${{ insert }}: ${{ parameters }}
76-
${{ insert }}: ${{ jobParameters }}
75+
- ${{ if not(jobParameters.disableJob) }}:
76+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
77+
parameters:
78+
${{ insert }}: ${{ parameters }}
79+
${{ insert }}: ${{ jobParameters }}
7780
- ${{ if eq(parameters.pool.os, 'macOS') }}:
7881
- ${{ each jobParameters in parameters.macOSJobParameterSets }}:
79-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
80-
parameters:
81-
${{ insert }}: ${{ parameters }}
82-
${{ insert }}: ${{ jobParameters }}
82+
- ${{ if not(jobParameters.disableJob) }}:
83+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
84+
parameters:
85+
${{ insert }}: ${{ parameters }}
86+
${{ insert }}: ${{ jobParameters }}

0 commit comments

Comments
 (0)